diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 16:09:17 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 16:09:21 +0000 |
| commit | 065319c229c76ded943a8a7cf55e1e6e1e55ae69 (patch) | |
| tree | 6b16c74b13eb2d8147aa346aa0dec247a8cd0a28 /arch/arm/mach-pxa/generic.h | |
| parent | c77ef898625f558c89c6ca0b27e2032f0fad4196 (diff) | |
| parent | 63ecf0a9b55ada8c59ac10472c4468b46cf2e97a (diff) | |
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
* 'board-specific' of git://github.com/hzhuang1/linux:
pxa/hx4700: Remove pcmcia platform_device structure
ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%
ARM: pxa/hx4700: Remove unwanted request for GPIO105
(update to 3.3-rc7)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-pxa/generic.h')
| -rw-r--r-- | arch/arm/mach-pxa/generic.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h index 0d729e6619d..42d5cca6625 100644 --- a/arch/arm/mach-pxa/generic.h +++ b/arch/arm/mach-pxa/generic.h @@ -49,7 +49,6 @@ extern unsigned pxa3xx_get_clk_frequency_khz(int); #endif extern struct syscore_ops pxa_irq_syscore_ops; -extern struct syscore_ops pxa_gpio_syscore_ops; extern struct syscore_ops pxa2xx_mfp_syscore_ops; extern struct syscore_ops pxa3xx_mfp_syscore_ops; |