git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'timers/clocksource', 'timers/hrtimers', 'timers/nohz', 'timers/ntp...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
tosa.c
diff --git
a/arch/arm/mach-pxa/tosa.c
b/arch/arm/mach-pxa/tosa.c
index
9f3ef9e
..
130e37e
100644
(file)
--- a/
arch/arm/mach-pxa/tosa.c
+++ b/
arch/arm/mach-pxa/tosa.c
@@
-781,7
+781,7
@@
static void __init tosa_init(void)
gpio_set_wake(MFP_PIN_GPIO1, 1);
/* We can't pass to gpio-keys since it will drop the Reset altfunc */
- init_gpio_reset(TOSA_GPIO_ON_RESET);
+ init_gpio_reset(TOSA_GPIO_ON_RESET
, 0
);
pm_power_off = tosa_poweroff;
arm_pm_restart = tosa_restart;