From 81cefc4064f5e529a7437412c7e48d5a98fe373d Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Thu, 31 Jan 2008 00:58:00 -0500 Subject: [PATCH] --- yaml --- r: 84357 b: refs/heads/master c: 1a1cd739a4b985f87c47e2809db7e240dba2c385 h: refs/heads/master i: 84355: 5238620f97b15c56e14cb1c0de87fcfc01e9b46e v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/pxa27x_keypad.c | 4 ---- trunk/include/asm-arm/arch-pxa/pxa27x_keypad.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index eccb79b548ea..ce748afdd3f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e5f11aa80bd01d048f374cc64ef0819ad7d86f2 +refs/heads/master: 1a1cd739a4b985f87c47e2809db7e240dba2c385 diff --git a/trunk/drivers/input/keyboard/pxa27x_keypad.c b/trunk/drivers/input/keyboard/pxa27x_keypad.c index 06c1d5abaa81..43fb63d68122 100644 --- a/trunk/drivers/input/keyboard/pxa27x_keypad.c +++ b/trunk/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/trunk/include/asm-arm/arch-pxa/pxa27x_keypad.h b/trunk/include/asm-arm/arch-pxa/pxa27x_keypad.h index f19f74adde00..ef17db6d791e 100644 --- a/trunk/include/asm-arm/arch-pxa/pxa27x_keypad.h +++ b/trunk/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;