diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-02-05 19:38:19 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-02 17:47:38 -0500 |
commit | 85fd6d63bf2927b9da7ab1b0d46723bfdb13808c (patch) | |
tree | 7033ac06e365209b09ba4b97eba0cf2f7ceb3312 /arch/arm/plat-s3c24xx | |
parent | b130d5c29544fe4cedafd35b112d27a06550d844 (diff) |
ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/
This patch moves S3C2410 stuff into mach-s3c24xx/ directory
so that we can merge the s3c24 series' directories to the
just one mach-s3c24xx/ directory.
And this patch is including following.
- re-ordered alphabetically by option text at Kconfig and Makefile
- removed unused option, MACH_N35
- fixed duplcated option name, S3C2410_DMA to S3C24XX_DMA which is
in plat-s3c24xx/
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-s3c24xx')
-rw-r--r-- | arch/arm/plat-s3c24xx/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig index 5a67eda57bb2..0c183fdf7284 100644 --- a/arch/arm/plat-s3c24xx/Kconfig +++ b/arch/arm/plat-s3c24xx/Kconfig | |||
@@ -82,7 +82,7 @@ config PM_SIMTEC | |||
82 | Common power management code for systems that are | 82 | Common power management code for systems that are |
83 | compatible with the Simtec style of power management | 83 | compatible with the Simtec style of power management |
84 | 84 | ||
85 | config S3C2410_DMA | 85 | config S3C24XX_DMA |
86 | bool "S3C2410 DMA support" | 86 | bool "S3C2410 DMA support" |
87 | depends on ARCH_S3C24XX | 87 | depends on ARCH_S3C24XX |
88 | select S3C_DMA | 88 | select S3C_DMA |
diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile index 32bd295f9c86..bce27ca28465 100644 --- a/arch/arm/plat-s3c24xx/Makefile +++ b/arch/arm/plat-s3c24xx/Makefile | |||
@@ -29,7 +29,7 @@ obj-$(CONFIG_PM) += irq-pm.o | |||
29 | obj-$(CONFIG_PM) += sleep.o | 29 | obj-$(CONFIG_PM) += sleep.o |
30 | obj-$(CONFIG_S3C2410_CLOCK) += s3c2410-clock.o | 30 | obj-$(CONFIG_S3C2410_CLOCK) += s3c2410-clock.o |
31 | obj-$(CONFIG_S3C2443_CLOCK) += s3c2443-clock.o | 31 | obj-$(CONFIG_S3C2443_CLOCK) += s3c2443-clock.o |
32 | obj-$(CONFIG_S3C2410_DMA) += dma.o | 32 | obj-$(CONFIG_S3C24XX_DMA) += dma.o |
33 | obj-$(CONFIG_S3C2410_IOTIMING) += s3c2410-iotiming.o | 33 | obj-$(CONFIG_S3C2410_IOTIMING) += s3c2410-iotiming.o |
34 | obj-$(CONFIG_S3C2412_IOTIMING) += s3c2412-iotiming.o | 34 | obj-$(CONFIG_S3C2412_IOTIMING) += s3c2412-iotiming.o |
35 | obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += s3c2410-cpufreq-utils.o | 35 | obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += s3c2410-cpufreq-utils.o |