diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h b/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h index 62d17421e48c..1e2f4e97f428 100644 --- a/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h +++ b/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h | |||
| @@ -5,6 +5,8 @@ | |||
| 5 | #ifndef __ASM_ARCH_EP93XX_KEYPAD_H | 5 | #ifndef __ASM_ARCH_EP93XX_KEYPAD_H |
| 6 | #define __ASM_ARCH_EP93XX_KEYPAD_H | 6 | #define __ASM_ARCH_EP93XX_KEYPAD_H |
| 7 | 7 | ||
| 8 | struct matrix_keymap_data; | ||
| 9 | |||
| 8 | /* flags for the ep93xx_keypad driver */ | 10 | /* flags for the ep93xx_keypad driver */ |
| 9 | #define EP93XX_KEYPAD_DISABLE_3_KEY (1<<0) /* disable 3-key reset */ | 11 | #define EP93XX_KEYPAD_DISABLE_3_KEY (1<<0) /* disable 3-key reset */ |
| 10 | #define EP93XX_KEYPAD_DIAG_MODE (1<<1) /* diagnostic mode */ | 12 | #define EP93XX_KEYPAD_DIAG_MODE (1<<1) /* diagnostic mode */ |
| @@ -15,15 +17,13 @@ | |||
| 15 | 17 | ||
| 16 | /** | 18 | /** |
| 17 | * struct ep93xx_keypad_platform_data - platform specific device structure | 19 | * struct ep93xx_keypad_platform_data - platform specific device structure |
| 18 | * @matrix_key_map: array of keycodes defining the keypad matrix | 20 | * @keymap_data: pointer to &matrix_keymap_data |
| 19 | * @matrix_key_map_size: ARRAY_SIZE(matrix_key_map) | 21 | * @debounce: debounce start count; terminal count is 0xff |
| 20 | * @debounce: debounce start count; terminal count is 0xff | 22 | * @prescale: row/column counter pre-scaler load value |
| 21 | * @prescale: row/column counter pre-scaler load value | 23 | * @flags: see above |
| 22 | * @flags: see above | ||
| 23 | */ | 24 | */ |
| 24 | struct ep93xx_keypad_platform_data { | 25 | struct ep93xx_keypad_platform_data { |
| 25 | unsigned int *matrix_key_map; | 26 | struct matrix_keymap_data *keymap_data; |
| 26 | int matrix_key_map_size; | ||
| 27 | unsigned int debounce; | 27 | unsigned int debounce; |
| 28 | unsigned int prescale; | 28 | unsigned int prescale; |
| 29 | unsigned int flags; | 29 | unsigned int flags; |
