From 6a8f26166fda1ea31fce2ac464131ce99e07dee0 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Tue, 21 Oct 2008 14:06:22 +0100
Subject: [PATCH] --- yaml --- r: 123803 b: refs/heads/master c:
 1b3ba68884d192f42fcf4352e1ac7174facc96af h: refs/heads/master i:   123801:
 09f829e530eaf57c973be03d750bbc9f13f0a19d   123799:
 d4cbbfebec7e443fe39c336f820cdfbd589e0d8c v: v3

---
 [refs]                                                    | 2 +-
 trunk/arch/arm/mach-s3c2410/Kconfig                       | 5 -----
 trunk/arch/arm/mach-s3c2410/Makefile                      | 1 -
 trunk/arch/arm/plat-s3c24xx/Kconfig                       | 8 ++++++++
 trunk/arch/arm/plat-s3c24xx/Makefile                      | 1 +
 .../clock.c => plat-s3c24xx/s3c2410-clock.c}              | 0
 6 files changed, 10 insertions(+), 7 deletions(-)
 rename trunk/arch/arm/{mach-s3c2410/clock.c => plat-s3c24xx/s3c2410-clock.c} (100%)

diff --git a/[refs] b/[refs]
index b96f9da49118..c47f8ed83255 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f565ecc33c5536a76cd73847874df5f804a49aa
+refs/heads/master: 1b3ba68884d192f42fcf4352e1ac7174facc96af
diff --git a/trunk/arch/arm/mach-s3c2410/Kconfig b/trunk/arch/arm/mach-s3c2410/Kconfig
index 7315569fbfd7..5453aff60486 100644
--- a/trunk/arch/arm/mach-s3c2410/Kconfig
+++ b/trunk/arch/arm/mach-s3c2410/Kconfig
@@ -33,11 +33,6 @@ config S3C2410_GPIO
 	help
 	  GPIO code for S3C2410 and similar processors
 
-config S3C2410_CLOCK
-	bool
-	help
-	  Clock code for the S3C2410, and similar processors
-
 config SIMTEC_NOR
 	bool
 	help
diff --git a/trunk/arch/arm/mach-s3c2410/Makefile b/trunk/arch/arm/mach-s3c2410/Makefile
index 00f31f8c4e78..fca02f82711c 100644
--- a/trunk/arch/arm/mach-s3c2410/Makefile
+++ b/trunk/arch/arm/mach-s3c2410/Makefile
@@ -15,7 +15,6 @@ obj-$(CONFIG_CPU_S3C2410_DMA)	+= dma.o
 obj-$(CONFIG_CPU_S3C2410_DMA)	+= dma.o
 obj-$(CONFIG_S3C2410_PM)	+= pm.o sleep.o
 obj-$(CONFIG_S3C2410_GPIO)	+= gpio.o
-obj-$(CONFIG_S3C2410_CLOCK)	+= clock.o
 
 # Machine support
 
diff --git a/trunk/arch/arm/plat-s3c24xx/Kconfig b/trunk/arch/arm/plat-s3c24xx/Kconfig
index 48ebf355a45c..2bc4b10f5227 100644
--- a/trunk/arch/arm/plat-s3c24xx/Kconfig
+++ b/trunk/arch/arm/plat-s3c24xx/Kconfig
@@ -15,6 +15,14 @@ config PLAT_S3C24XX
 
 if PLAT_S3C24XX
 
+# code that is shared between a number of the s3c24xx implementations
+
+config S3C2410_CLOCK
+	bool
+	help
+	  Clock code for the S3C2410, and similar processors which
+	  is currently includes the S3C2410, S3C2440, S3C2442.
+
 config CPU_S3C244X
 	bool
 	depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442)
diff --git a/trunk/arch/arm/plat-s3c24xx/Makefile b/trunk/arch/arm/plat-s3c24xx/Makefile
index 6b574016dc44..095a6c2324da 100644
--- a/trunk/arch/arm/plat-s3c24xx/Makefile
+++ b/trunk/arch/arm/plat-s3c24xx/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_PM_SIMTEC)		+= pm-simtec.o
 obj-$(CONFIG_PM)		+= pm.o
 obj-$(CONFIG_PM)		+= sleep.o
 obj-$(CONFIG_HAVE_PWM)		+= pwm.o
+obj-$(CONFIG_S3C2410_CLOCK)	+= s3c2410-clock.o
 obj-$(CONFIG_S3C2410_DMA)	+= dma.o
 
 # SPI gpio central GPIO functions
diff --git a/trunk/arch/arm/mach-s3c2410/clock.c b/trunk/arch/arm/plat-s3c24xx/s3c2410-clock.c
similarity index 100%
rename from trunk/arch/arm/mach-s3c2410/clock.c
rename to trunk/arch/arm/plat-s3c24xx/s3c2410-clock.c