From d395912fdf0439ab3523132c61f7b763e241e04d Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Tue, 26 Jan 2010 16:31:32 +0900
Subject: [PATCH] --- yaml --- r: 187647 b: refs/heads/master c:
 916ee9249a7f19d8eb18cc9ee16ca495a517ab34 h: refs/heads/master i:   187645:
 41e6e2e51c6f40671ff6dad72ae86cb97f447db1   187643:
 3e11a6a7eaafcd229bad91620f81d88a6b3d9ca1   187639:
 fa54f4b99ebbcf66085ce87eacd6a3cc655a2e1a   187631:
 32d028c2f581eaee1b0b436bae1b204cb0cd4f8e   187615:
 923b500a9320c512fd967942f979088644729925   187583:
 d874075d5d884412e2615d8f02b8e3bed431b13c   187519:
 d294229d7adf099b1119143080b7df2a678c8826   187391:
 9a787add5859f224af9b6dbf0d8adab2c66df006 v: v3

---
 [refs]                                               |  2 +-
 trunk/arch/arm/mach-s3c2440/Kconfig                  | 12 ++++++++++++
 trunk/arch/arm/mach-s3c2440/Makefile                 |  2 ++
 .../arm/{mach-s3c2442 => mach-s3c2440}/s3c2442.c     |  0
 trunk/arch/arm/mach-s3c2442/Kconfig                  | 11 -----------
 5 files changed, 15 insertions(+), 12 deletions(-)
 rename trunk/arch/arm/{mach-s3c2442 => mach-s3c2440}/s3c2442.c (100%)

diff --git a/[refs] b/[refs]
index 24370a28033d..18975db3b27f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f51bbfd5905b8c860cc95ae10c20e0844d0ade8
+refs/heads/master: 916ee9249a7f19d8eb18cc9ee16ca495a517ab34
diff --git a/trunk/arch/arm/mach-s3c2440/Kconfig b/trunk/arch/arm/mach-s3c2440/Kconfig
index 45cab7af5cde..f496385e1c75 100644
--- a/trunk/arch/arm/mach-s3c2440/Kconfig
+++ b/trunk/arch/arm/mach-s3c2440/Kconfig
@@ -15,6 +15,18 @@ config CPU_S3C2440
 	help
 	  Support for S3C2440 Samsung Mobile CPU based systems.
 
+config CPU_S3C2442
+	bool
+	depends on ARCH_S3C2410
+	select CPU_ARM920T
+	select S3C2410_CLOCK
+	select S3C2410_GPIO
+	select S3C2410_PM if PM
+	select CPU_S3C244X
+	select CPU_LLSERIAL_S3C2440
+	help
+	  Support for S3C2442 Samsung Mobile CPU based systems.
+
 config S3C2440_DMA
 	bool
 	depends on ARCH_S3C2410 && CPU_S3C24405B
diff --git a/trunk/arch/arm/mach-s3c2440/Makefile b/trunk/arch/arm/mach-s3c2440/Makefile
index e51497ca12ea..e8412b35dcb0 100644
--- a/trunk/arch/arm/mach-s3c2440/Makefile
+++ b/trunk/arch/arm/mach-s3c2440/Makefile
@@ -10,6 +10,8 @@ obj-n				:=
 obj-				:=
 
 obj-$(CONFIG_CPU_S3C2440)	+= s3c2440.o dsc.o
+obj-$(CONFIG_CPU_S3C2442)	+= s3c2442.o
+
 obj-$(CONFIG_CPU_S3C2440)	+= irq.o
 obj-$(CONFIG_CPU_S3C2440)	+= clock.o
 obj-$(CONFIG_S3C2440_DMA)	+= dma.o
diff --git a/trunk/arch/arm/mach-s3c2442/s3c2442.c b/trunk/arch/arm/mach-s3c2440/s3c2442.c
similarity index 100%
rename from trunk/arch/arm/mach-s3c2442/s3c2442.c
rename to trunk/arch/arm/mach-s3c2440/s3c2442.c
diff --git a/trunk/arch/arm/mach-s3c2442/Kconfig b/trunk/arch/arm/mach-s3c2442/Kconfig
index 4832cd6ccfbc..29ef0669e959 100644
--- a/trunk/arch/arm/mach-s3c2442/Kconfig
+++ b/trunk/arch/arm/mach-s3c2442/Kconfig
@@ -2,14 +2,3 @@
 #
 # Licensed under GPLv2
 
-config CPU_S3C2442
-	bool
-	depends on ARCH_S3C2410
-	select CPU_ARM920T
-	select S3C2410_CLOCK
-	select S3C2410_GPIO
-	select S3C2410_PM if PM
-	select CPU_S3C244X
-	select CPU_LLSERIAL_S3C2440
-	help
-	  Support for S3C2442 Samsung Mobile CPU based systems.