diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-17 07:51:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-17 07:51:07 +0100 |
| commit | 99f4c9de2b707795acb215e2e94df7ea266042b5 (patch) | |
| tree | 6123682a8e0d880feebb690a55b3fb442ef3dee8 /arch/arm/mach-pxa/palmtc.c | |
| parent | 62ad33f67003b9a7b6013f0511579b9805e11626 (diff) | |
| parent | 156171c71a0dc4bce12b4408bb1591f8fe32dc1a (diff) | |
| download | blackbird-op-linux-99f4c9de2b707795acb215e2e94df7ea266042b5.tar.gz blackbird-op-linux-99f4c9de2b707795acb215e2e94df7ea266042b5.zip | |
Merge commit 'v2.6.32-rc7' into core/iommu
Merge reason: Add fixes we'll depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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[] = { static struct matrix_keypad_platform_data palmtc_keypad_platform_data = { .keymap_data = &palmtc_keymap_data, - .col_gpios = palmtc_keypad_row_gpios, - .num_col_gpios = 12, - .row_gpios = palmtc_keypad_col_gpios, - .num_row_gpios = 4, + .row_gpios = palmtc_keypad_row_gpios, + .num_row_gpios = ARRAY_SIZE(palmtc_keypad_row_gpios), + .col_gpios = palmtc_keypad_col_gpios, + .num_col_gpios = ARRAY_SIZE(palmtc_keypad_col_gpios), .active_low = 1, .debounce_ms = 20, |
