diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-06 17:12:13 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-06 17:12:26 +0100 |
| commit | 6b60805502fecc5ce05dad68fd242c4f3a1d1f1b (patch) | |
| tree | a53537e00ede0a31b8f9f91c1d79d1e1a6670797 /arch/arm/mach-pxa/generic.h | |
| parent | Merge branch 'v3.3-samsung-fixes-4' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | ARM: pxa: fix invalid mfp pin issue (diff) | |
| download | linux-6b60805502fecc5ce05dad68fd242c4f3a1d1f1b.tar.xz linux-6b60805502fecc5ce05dad68fd242c4f3a1d1f1b.zip | |
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
* 'fixes' of git://github.com/hzhuang1/linux: (3 commits)
ARM: pxa: fix invalid mfp pin issue
ARM: pxa: remove duplicated registeration on pxa-gpio
ARM: pxa: add dummy clock for pxa25x and pxa27x
Includes an update to v3.3-rc6
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 0d729e6619df..42d5cca66257 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; |