diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 11:16:05 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 11:16:05 +0100 |
| commit | 355532bdda14a7162cee55fdd67600bf9bc9a152 (patch) | |
| tree | 96c6e79c22ba65a47685097460b8e0168a2ff431 /arch/arm/mach-pxa/tosa.c | |
| parent | 2528ed119b8f4fc553f9d1e65719ae183ffa97f4 (diff) | |
| parent | 6ec04f434d29aed33608e0ca4d8b100190e71e96 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/tosa.c')
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index afac5b6d3d7..a0bd46ef5d3 100644 --- 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 */ - 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; |