diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:32 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:32 -0500 |
| commit | 79598324838a25cc378ecbb8c29dd1e3d3951d35 (patch) | |
| tree | 7d29e81580cba854042df4e33bdc8f38bbd65d03 /arch/arm/mach-pxa/palmtc.c | |
| parent | 8ee763b9c82c6ca0a59a7271ce4fa29d7baf5c09 (diff) | |
| parent | b00615d163cd24fa98d155acfc1f9d81d6fe1103 (diff) | |
Merge branch 'topic/core-change' into for-linus
Diffstat (limited to 'arch/arm/mach-pxa/palmtc.c')
| -rw-r--r-- | arch/arm/mach-pxa/palmtc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c index bb2cc0dd44ec..0b92291a58f6 100644 --- a/arch/arm/mach-pxa/palmtc.c +++ b/arch/arm/mach-pxa/palmtc.c | |||
| @@ -292,10 +292,10 @@ const static unsigned int palmtc_keypad_col_gpios[] = { | |||
| 292 | 292 | ||
| 293 | static struct matrix_keypad_platform_data palmtc_keypad_platform_data = { | 293 | static struct matrix_keypad_platform_data palmtc_keypad_platform_data = { |
| 294 | .keymap_data = &palmtc_keymap_data, | 294 | .keymap_data = &palmtc_keymap_data, |
| 295 | .col_gpios = palmtc_keypad_row_gpios, | 295 | .row_gpios = palmtc_keypad_row_gpios, |
| 296 | .num_col_gpios = 12, | 296 | .num_row_gpios = ARRAY_SIZE(palmtc_keypad_row_gpios), |
| 297 | .row_gpios = palmtc_keypad_col_gpios, | 297 | .col_gpios = palmtc_keypad_col_gpios, |
| 298 | .num_row_gpios = 4, | 298 | .num_col_gpios = ARRAY_SIZE(palmtc_keypad_col_gpios), |
| 299 | .active_low = 1, | 299 | .active_low = 1, |
| 300 | 300 | ||
| 301 | .debounce_ms = 20, | 301 | .debounce_ms = 20, |