summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2010-04-18 09:35:29 +0200
committerEric Miao <eric.y.miao@gmail.com>2010-05-06 11:12:11 +0800
commit299ed07868e2384dd3bff44e30892cfdadd7e1bc (patch)
tree9f19550008563cb1e9c5babef361fe12a520c988 /arch
parent12145cae4d829d9d246a6272daef79074b5f4878 (diff)
downloadop-kernel-dev-299ed07868e2384dd3bff44e30892cfdadd7e1bc.zip
op-kernel-dev-299ed07868e2384dd3bff44e30892cfdadd7e1bc.tar.gz
[ARM] pxa/raumfeld: fix button name
"on/off button" was recently renamed to remove the slash character. Follow that change in the pin polarity detection as well. While at it, fix another cosmetic coding style flaw as well. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/raumfeld.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
index 44bb675..d12667b 100644
--- a/arch/arm/mach-pxa/raumfeld.c
+++ b/arch/arm/mach-pxa/raumfeld.c
@@ -983,7 +983,7 @@ static void __init raumfeld_common_init(void)
int i;
for (i = 0; i < ARRAY_SIZE(gpio_keys_button); i++)
- if (!strcmp(gpio_keys_button[i].desc, "on/off button"))
+ if (!strcmp(gpio_keys_button[i].desc, "on_off button"))
gpio_keys_button[i].active_low = 1;
}
@@ -1009,8 +1009,7 @@ static void __init raumfeld_common_init(void)
gpio_direction_output(GPIO_W2W_PDN, 0);
/* this can be used to switch off the device */
- ret = gpio_request(GPIO_SHUTDOWN_SUPPLY,
- "supply shutdown");
+ ret = gpio_request(GPIO_SHUTDOWN_SUPPLY, "supply shutdown");
if (ret < 0)
pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n");
else
OpenPOWER on IntegriCloud