diff options
-rw-r--r-- | drivers/input/keyboard/pxa27x_keypad.c | 4 | ||||
-rw-r--r-- | include/asm-arm/arch-pxa/pxa27x_keypad.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index 06c1d5abaa81..43fb63d68122 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c | |||
@@ -208,10 +208,6 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev) | |||
208 | if (error) | 208 | if (error) |
209 | goto err_free_irq; | 209 | goto err_free_irq; |
210 | 210 | ||
211 | /* Setup GPIOs. */ | ||
212 | for (i = 0; i < pdata->nr_rows + pdata->nr_cols; i++) | ||
213 | pxa_gpio_mode(pdata->gpio_modes[i]); | ||
214 | |||
215 | /* | 211 | /* |
216 | * Store rows/cols info into keyboard registers. | 212 | * Store rows/cols info into keyboard registers. |
217 | */ | 213 | */ |
diff --git a/include/asm-arm/arch-pxa/pxa27x_keypad.h b/include/asm-arm/arch-pxa/pxa27x_keypad.h index f19f74adde00..ef17db6d791e 100644 --- a/include/asm-arm/arch-pxa/pxa27x_keypad.h +++ b/include/asm-arm/arch-pxa/pxa27x_keypad.h | |||
@@ -4,7 +4,6 @@ | |||
4 | struct pxa27x_keypad_platform_data { | 4 | struct pxa27x_keypad_platform_data { |
5 | int nr_rows, nr_cols; | 5 | int nr_rows, nr_cols; |
6 | int keycodes[PXAKBD_MAXROW][PXAKBD_MAXCOL]; | 6 | int keycodes[PXAKBD_MAXROW][PXAKBD_MAXCOL]; |
7 | int gpio_modes[PXAKBD_MAXROW + PXAKBD_MAXCOL]; | ||
8 | 7 | ||
9 | #ifdef CONFIG_PM | 8 | #ifdef CONFIG_PM |
10 | u32 reg_kpc; | 9 | u32 reg_kpc; |