diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-05 12:55:04 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-05 12:55:04 +0000 |
| commit | eef3044965740a5e153d7b1e456e1b3e0fc3e619 (patch) | |
| tree | 8f5c38c32a0105e97ddb7af1466b5eefaa9df5ca /arch/arm/mach-pxa/palmtc.c | |
| parent | 91d3f9bacdb4950d2f79fe2ba296aa249f60d06c (diff) | |
| parent | c482ae4dcf23fd241321595d71bbe8aee33eabf5 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
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 bb2cc0dd44e..0b92291a58f 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, |