aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/input/keyboard/pxa27x_keypad.c4
-rw-r--r--include/asm-arm/arch-pxa/pxa27x_keypad.h1
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index 06c1d5abaa8..43fb63d6812 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)
if (error)
goto err_free_irq;
- /* Setup GPIOs. */
- for (i = 0; i < pdata->nr_rows + pdata->nr_cols; i++)
- pxa_gpio_mode(pdata->gpio_modes[i]);
-
/*
* Store rows/cols info into keyboard registers.
*/
diff --git a/include/asm-arm/arch-pxa/pxa27x_keypad.h b/include/asm-arm/arch-pxa/pxa27x_keypad.h
index f19f74adde0..ef17db6d791 100644
--- a/include/asm-arm/arch-pxa/pxa27x_keypad.h
+++ b/include/asm-arm/arch-pxa/pxa27x_keypad.h
@@ -4,7 +4,6 @@
struct pxa27x_keypad_platform_data {
int nr_rows, nr_cols;
int keycodes[PXAKBD_MAXROW][PXAKBD_MAXCOL];
- int gpio_modes[PXAKBD_MAXROW + PXAKBD_MAXCOL];
#ifdef CONFIG_PM
u32 reg_kpc;