diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 22:43:01 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 22:43:01 +0200 |
| commit | 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b (patch) | |
| tree | 110d24e6394dbd98cb33d80a5587cd18c8315e0b /include/asm-arm/arch-pxa/hardware.h | |
| parent | Merge branches 'pxa-ian' and 'pxa-xm270' into pxa (diff) | |
| parent | [ARM] 5152/1: Add myself to tosa maintainers list (diff) | |
| download | linux-7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b.tar.xz linux-7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b.zip | |
Merge branch 'pxa-tosa' into pxa
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'include/asm-arm/arch-pxa/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/hardware.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h index b6a8317c2ec4..09868de841a5 100644 --- a/include/asm-arm/arch-pxa/hardware.h +++ b/include/asm-arm/arch-pxa/hardware.h @@ -208,6 +208,11 @@ extern void pxa_gpio_set_value(unsigned gpio, int value); */ extern unsigned int get_memclk_frequency_10khz(void); +/* + * register GPIO as reset generator + */ +extern int init_gpio_reset(int gpio); + #endif #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) |