Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 190648
b: refs/heads/master
c: 299ed07
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Mack authored and Eric Miao committed May 6, 2010
1 parent e6c7c6d commit 1b87772
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 12145cae4d829d9d246a6272daef79074b5f4878
refs/heads/master: 299ed07868e2384dd3bff44e30892cfdadd7e1bc
5 changes: 2 additions & 3 deletions trunk/arch/arm/mach-pxa/raumfeld.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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
Expand Down

0 comments on commit 1b87772

Please sign in to comment.