diff options
| author |  Arnd Bergmann <arnd@arndb.de>
| 2012-03-19 20:52:33 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de>
| 2012-03-20 10:07:48 +0000 |
| commit | bde755679a3ba5af0d16231f8532e8373c5e2ecc (patch) | |
| tree | 782fa01306ada3e084bd3c47ea1af378b97c0e16 /arch/arm/mach-s3c64xx | |
| parent | Merge branch 'renesas/soc' into next/soc (diff) | |
| parent | ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver (diff) | |
| download | linux-bde755679a3ba5af0d16231f8532e8373c5e2ecc.tar.gz linux-bde755679a3ba5af0d16231f8532e8373c5e2ecc.tar.bz2 linux-bde755679a3ba5af0d16231f8532e8373c5e2ecc.zip | |
Merge branch 'samsung/cleanup-exynos-clock' into next/soc
Conflicts:
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/clock.c
The cleanup moves the exynos4 clock implementation away, while
the other branch modifies the file with the old name.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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, }; |