diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 01:40:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 01:40:34 -0700 |
| commit | 13223cb02ccfa375f2d683d08d30db5b72264f1e (patch) | |
| tree | d3fc7d803d22bbfe03b96cf0ba38041d42c8a1c2 /drivers/input/serio/rpckbd.c | |
| parent | 1383bdb98c01bbd28d72336d1bf614ce79114d29 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
| download | op-kernel-dev-13223cb02ccfa375f2d683d08d30db5b72264f1e.zip op-kernel-dev-13223cb02ccfa375f2d683d08d30db5b72264f1e.tar.gz | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/input/serio/rpckbd.c')
| -rw-r--r-- | drivers/input/serio/rpckbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c index 7f36edd3..ed045c9 100644 --- a/drivers/input/serio/rpckbd.c +++ b/drivers/input/serio/rpckbd.c @@ -33,10 +33,10 @@ #include <linux/serio.h> #include <linux/err.h> #include <linux/platform_device.h> +#include <linux/io.h> #include <asm/irq.h> #include <mach/hardware.h> -#include <asm/io.h> #include <asm/hardware/iomd.h> #include <asm/system.h> |
