diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 22:07:57 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 22:07:57 +0100 |
| commit | e7051e9dab77ddeaddbe12364939ae239d92ca73 (patch) | |
| tree | b1855cb663f64a374277df1a909cbac1ecf15fbf /arch/arm/mach-s3c64xx | |
| parent | Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel... (diff) | |
| parent | Merge branch 'next/soc-exynos5250-arch' of git://git.kernel.org/pub/scm/linux... (diff) | |
| download | linux-e7051e9dab77ddeaddbe12364939ae239d92ca73.tar.xz linux-e7051e9dab77ddeaddbe12364939ae239d92ca73.zip | |
Merge branch 'samsung/exynos5' into next/soc2
Diffstat (limited to 'arch/arm/mach-s3c64xx')
| -rw-r--r-- | arch/arm/mach-s3c64xx/common.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c64xx/irq-pm.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c64xx/common.h b/arch/arm/mach-s3c64xx/common.h index 5eb9c9a7d73b..7a10be629aba 100644 --- a/arch/arm/mach-s3c64xx/common.h +++ b/arch/arm/mach-s3c64xx/common.h @@ -25,8 +25,6 @@ void s3c64xx_setup_clocks(void); void s3c64xx_restart(char mode, const char *cmd); -extern struct syscore_ops s3c64xx_irq_syscore_ops; - #ifdef CONFIG_CPU_S3C6400 extern int s3c6400_init(void); diff --git a/arch/arm/mach-s3c64xx/irq-pm.c b/arch/arm/mach-s3c64xx/irq-pm.c index 8bec61e242c7..0c7e1d960ca4 100644 --- a/arch/arm/mach-s3c64xx/irq-pm.c +++ b/arch/arm/mach-s3c64xx/irq-pm.c @@ -96,7 +96,7 @@ static void s3c64xx_irq_pm_resume(void) S3C_PMDBG("%s: IRQ configuration restored\n", __func__); } -struct syscore_ops s3c64xx_irq_syscore_ops = { +static struct syscore_ops s3c64xx_irq_syscore_ops = { .suspend = s3c64xx_irq_pm_suspend, .resume = s3c64xx_irq_pm_resume, }; |