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 branch 'topic/usb-audio' into for-linus
[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
afac5b6
..
a0bd46e
100644
(file)
--- a/
arch/arm/mach-pxa/tosa.c
+++ b/
arch/arm/mach-pxa/tosa.c
@@
-897,7
+897,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 */
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, 0);
+ init_gpio_reset(TOSA_GPIO_ON_RESET, 0
, 0
);
pm_power_off = tosa_poweroff;
arm_pm_restart = tosa_restart;
pm_power_off = tosa_poweroff;
arm_pm_restart = tosa_restart;