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/include | |
| parent | 2528ed119b8f4fc553f9d1e65719ae183ffa97f4 (diff) | |
| parent | 6ec04f434d29aed33608e0ca4d8b100190e71e96 (diff) | |
| download | blackbird-op-linux-355532bdda14a7162cee55fdd67600bf9bc9a152.tar.gz blackbird-op-linux-355532bdda14a7162cee55fdd67600bf9bc9a152.zip | |
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/include')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/reset.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/reset.h b/arch/arm/mach-pxa/include/mach/reset.h index 31e6a7b6ad80..b6c10556fbc7 100644 --- a/arch/arm/mach-pxa/include/mach/reset.h +++ b/arch/arm/mach-pxa/include/mach/reset.h @@ -13,8 +13,9 @@ extern void clear_reset_status(unsigned int mask); /** * init_gpio_reset() - register GPIO as reset generator * @gpio: gpio nr - * @output: set gpio as out/low instead of input during normal work + * @output: set gpio as output instead of input during normal work + * @level: output level */ -extern int init_gpio_reset(int gpio, int output); +extern int init_gpio_reset(int gpio, int output, int level); #endif /* __ASM_ARCH_RESET_H */ |
