diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
| commit | 83bd6998b04fc1bb7280b14f16b2bdbdc07c914b (patch) | |
| tree | af1bbe2bac5752b69b1ac58bf5d822c735da439b /drivers/input/keyboard/tosakbd.c | |
| parent | e7250b8ae3870f37f660c2f65cafcaba85e3bfd3 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | blackbird-op-linux-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.tar.gz blackbird-op-linux-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.zip | |
Merge commit 'v2.6.27-rc6' into timers/hpet
Diffstat (limited to 'drivers/input/keyboard/tosakbd.c')
| -rw-r--r-- | drivers/input/keyboard/tosakbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/tosakbd.c b/drivers/input/keyboard/tosakbd.c index b12b7ee4b6aa..44cb50af3ce9 100644 --- a/drivers/input/keyboard/tosakbd.c +++ b/drivers/input/keyboard/tosakbd.c @@ -19,8 +19,8 @@ #include <linux/delay.h> #include <linux/interrupt.h> -#include <asm/arch/gpio.h> -#include <asm/arch/tosa.h> +#include <mach/gpio.h> +#include <mach/tosa.h> #define KB_ROWMASK(r) (1 << (r)) #define SCANCODE(r, c) (((r)<<4) + (c) + 1) |
