diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 20:13:59 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 20:13:59 +0100 |
| commit | 83fe628e16d84efc8df2731bc403eae4e4f53801 (patch) | |
| tree | 9a51c292235621d0f4f632c2a55ddb5a6ab582af /arch/arm/mach-pxa/pxa95x.c | |
| parent | Merge branch 'samsung/soc' into next/soc2 (diff) | |
| parent | Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh in... (diff) | |
| download | linux-83fe628e16d84efc8df2731bc403eae4e4f53801.tar.xz linux-83fe628e16d84efc8df2731bc403eae4e4f53801.zip | |
Merge branch 'renesas/soc' into next/soc2
Diffstat (limited to 'arch/arm/mach-pxa/pxa95x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa95x.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa95x.c b/arch/arm/mach-pxa/pxa95x.c index d082a583df78..5ce434b95e87 100644 --- a/arch/arm/mach-pxa/pxa95x.c +++ b/arch/arm/mach-pxa/pxa95x.c @@ -283,7 +283,6 @@ static int __init pxa95x_init(void) return ret; register_syscore_ops(&pxa_irq_syscore_ops); - register_syscore_ops(&pxa_gpio_syscore_ops); register_syscore_ops(&pxa3xx_clock_syscore_ops); ret = platform_add_devices(devices, ARRAY_SIZE(devices)); |