diff options
| author | Kukjin Kim | 2012-03-11 07:21:36 +0100 |
|---|---|---|
| committer | Kukjin Kim | 2012-03-11 07:21:36 +0100 |
| commit | c15a04338b5a6d4305d107a5b6c0cd43418b7f3e (patch) | |
| tree | 04d40a3b4fbc0477aa71c11044a20ff2d6666004 /arch/arm/mach-s3c64xx | |
| parent | Linux 3.3-rc6 (diff) | |
| parent | Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static (diff) | |
| download | kernel-qcow2-linux-c15a04338b5a6d4305d107a5b6c0cd43418b7f3e.tar.gz kernel-qcow2-linux-c15a04338b5a6d4305d107a5b6c0cd43418b7f3e.tar.xz kernel-qcow2-linux-c15a04338b5a6d4305d107a5b6c0cd43418b7f3e.zip | |
Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock
Diffstat (limited to 'arch/arm/mach-s3c64xx')
| -rw-r--r-- | arch/arm/mach-s3c64xx/common.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/system.h | 19 | ||||
| -rw-r--r-- | arch/arm/mach-s3c64xx/irq-pm.c | 2 |
3 files changed, 1 insertions, 22 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/include/mach/system.h b/arch/arm/mach-s3c64xx/include/mach/system.h deleted file mode 100644 index 353ed4389ae7..000000000000 --- a/arch/arm/mach-s3c64xx/include/mach/system.h +++ /dev/null @@ -1,19 +0,0 @@ -/* linux/arch/arm/mach-s3c6400/include/mach/system.h - * - * Copyright 2008 Openmoko, Inc. - * Copyright 2008 Simtec Electronics - * Ben Dooks <ben@simtec.co.uk> - * http://armlinux.simtec.co.uk/ - * - * S3C6400 - system implementation - */ - -#ifndef __ASM_ARCH_SYSTEM_H -#define __ASM_ARCH_SYSTEM_H __FILE__ - -static void arch_idle(void) -{ - /* nothing here yet */ -} - -#endif /* __ASM_ARCH_IRQ_H */ 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, }; |