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/Makefile | |
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/Makefile')
-rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 624f76442ab4..59d9df40ca10 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -175,7 +175,7 @@ machine-$(CONFIG_ARCH_PRIMA2) := prima2 | |||
175 | machine-$(CONFIG_ARCH_PXA) := pxa | 175 | machine-$(CONFIG_ARCH_PXA) := pxa |
176 | machine-$(CONFIG_ARCH_REALVIEW) := realview | 176 | machine-$(CONFIG_ARCH_REALVIEW) := realview |
177 | machine-$(CONFIG_ARCH_RPC) := rpc | 177 | machine-$(CONFIG_ARCH_RPC) := rpc |
178 | machine-$(CONFIG_ARCH_S3C24XX) := s3c2410 s3c2412 s3c2416 s3c2440 s3c2443 | 178 | machine-$(CONFIG_ARCH_S3C24XX) := s3c24xx s3c2412 s3c2416 s3c2440 s3c2443 |
179 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx | 179 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx |
180 | machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 | 180 | machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 |
181 | machine-$(CONFIG_ARCH_S5PC100) := s5pc100 | 181 | machine-$(CONFIG_ARCH_S5PC100) := s5pc100 |