diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-01-02 23:01:09 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-01-10 19:45:38 +0100 |
| commit | b4353784ea6d5fd4cffa7498b656f5a72d20f2cd (patch) | |
| tree | 8dc9bf0a9a319a7f4605c1b05ea712436b5491ef /arch/arm/mach-s3c24xx | |
| parent | ARM: S3C24XX: remove idle.h (diff) | |
| download | linux-b4353784ea6d5fd4cffa7498b656f5a72d20f2cd.tar.xz linux-b4353784ea6d5fd4cffa7498b656f5a72d20f2cd.zip | |
ARM: S3C24XX: remove dsc.c and make regs-dsc.h local
The mach-s3c2440/dsc.c is no longer used and the header, regs-dsc.h
can be local in mach-s3c24xx/.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c24xx')
| -rw-r--r-- | arch/arm/mach-s3c24xx/pm-s3c2412.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/regs-dsc.h (renamed from arch/arm/mach-s3c24xx/include/mach/regs-dsc.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/s3c2412.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/s3c244x.c | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c24xx/pm-s3c2412.c b/arch/arm/mach-s3c24xx/pm-s3c2412.c index c60f67a75aff..206765cc4092 100644 --- a/arch/arm/mach-s3c24xx/pm-s3c2412.c +++ b/arch/arm/mach-s3c24xx/pm-s3c2412.c @@ -21,19 +21,19 @@ #include <linux/platform_device.h> #include <linux/io.h> -#include <mach/hardware.h> #include <asm/cacheflush.h> #include <asm/irq.h> -#include <mach/regs-power.h> +#include <mach/hardware.h> #include <mach/regs-gpio.h> -#include <mach/regs-dsc.h> +#include <mach/regs-power.h> #include <plat/cpu.h> #include <plat/pm.h> - #include <plat/s3c2412.h> +#include "regs-dsc.h" + extern void s3c2412_sleep_enter(void); static int s3c2412_cpu_suspend(unsigned long arg) diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-dsc.h b/arch/arm/mach-s3c24xx/regs-dsc.h index 98fd4a05587c..98fd4a05587c 100644 --- a/arch/arm/mach-s3c24xx/include/mach/regs-dsc.h +++ b/arch/arm/mach-s3c24xx/regs-dsc.h diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c index 26ab76094a65..c511a225f07a 100644 --- a/arch/arm/mach-s3c24xx/s3c2412.c +++ b/arch/arm/mach-s3c24xx/s3c2412.c @@ -33,7 +33,6 @@ #include <mach/hardware.h> #include <mach/regs-clock.h> -#include <mach/regs-dsc.h> #include <mach/regs-gpio.h> #include <mach/regs-power.h> @@ -48,6 +47,8 @@ #include <plat/regs-spi.h> #include <plat/s3c2412.h> +#include "regs-dsc.h" + #define S3C2412_SWRST (S3C24XX_VA_CLKPWR + 0x30) #define S3C2412_SWRST_RESET (0x533C2412) diff --git a/arch/arm/mach-s3c24xx/s3c244x.c b/arch/arm/mach-s3c24xx/s3c244x.c index b0b60a1154d6..ad2671baa910 100644 --- a/arch/arm/mach-s3c24xx/s3c244x.c +++ b/arch/arm/mach-s3c24xx/s3c244x.c @@ -36,7 +36,6 @@ #include <mach/regs-clock.h> #include <plat/regs-serial.h> #include <mach/regs-gpio.h> -#include <mach/regs-dsc.h> #include <plat/s3c2410.h> #include <plat/s3c244x.h> @@ -48,6 +47,8 @@ #include <plat/nand-core.h> #include <plat/watchdog-reset.h> +#include "regs-dsc.h" + static struct map_desc s3c244x_iodesc[] __initdata = { IODESC_ENT(CLKPWR), IODESC_ENT(TIMER), |