diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:42 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:42 -0400 |
| commit | b6825d2df55aa7d7341c715b577b73a6a03dc944 (patch) | |
| tree | ae4f0f52f4c2ad4e501dd323318486ccdd7fcd93 /drivers/input | |
| parent | 6defd90433729c2d795865165cb34d938d8ff07c (diff) | |
| parent | aa59e19d05114f9fb7718d6bc8398255476fb4f5 (diff) | |
Merge branch 'omap-all' into devel
Conflicts:
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/irq.c
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/keyboard/omap-keypad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index dcea87a0bc56..039787f81ed8 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c | |||
| @@ -62,7 +62,7 @@ struct omap_kp { | |||
| 62 | unsigned int debounce; | 62 | unsigned int debounce; |
| 63 | }; | 63 | }; |
| 64 | 64 | ||
| 65 | DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0); | 65 | static DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0); |
| 66 | 66 | ||
| 67 | static int *keymap; | 67 | static int *keymap; |
| 68 | static unsigned int *row_gpios; | 68 | static unsigned int *row_gpios; |