diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 16:43:01 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 16:43:01 -0400 |
| commit | 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b (patch) | |
| tree | 110d24e6394dbd98cb33d80a5587cd18c8315e0b /include/asm-arm/arch-pxa/hardware.h | |
| parent | a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3 (diff) | |
| parent | 938870491f0cad030b358af47e28d124b72702d1 (diff) | |
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); | |||
| 208 | */ | 208 | */ |
| 209 | extern unsigned int get_memclk_frequency_10khz(void); | 209 | extern unsigned int get_memclk_frequency_10khz(void); |
| 210 | 210 | ||
| 211 | /* | ||
| 212 | * register GPIO as reset generator | ||
| 213 | */ | ||
| 214 | extern int init_gpio_reset(int gpio); | ||
| 215 | |||
| 211 | #endif | 216 | #endif |
| 212 | 217 | ||
| 213 | #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) | 218 | #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) |