ARM: S3C64XX: Merge s3c6400-clock.c and clock.c into mach-s3c64xx

Merge plat-s3c64xx/s3c6400-clock.c mach-s3c64xx/clock.c placing all the
clock code into one place.

Note, no effort is made in this patch to squash the init functions
together.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

arch/arm/mach-s3c64xx/Kconfig

@@ -7,13 +7,11 @@
 
 config CPU_S3C6400
 	bool
-	select CPU_S3C6400_CLOCK
 	help
 	  Enable S3C6400 CPU support
 
 config CPU_S3C6410
 	bool
-	select CPU_S3C6400_CLOCK
 	help
 	  Enable S3C6410 CPU support
 

arch/arm/plat-s3c64xx/Kconfig

@@ -25,15 +25,3 @@ config PLAT_S3C64XX
 	select SAMSUNG_GPIOLIB_4BIT
 	help
 	  Base platform code for any Samsung S3C64XX device
-
-if PLAT_S3C64XX
-
-# Configuration options shared by all S3C64XX implementations
-
-config CPU_S3C6400_CLOCK
-	bool
-	help
-	  Common clock support code for the S3C6400 that is shared
-	  by other CPUs in the series, such as the S3C6410.
-
-endif

arch/arm/plat-s3c64xx/Makefile

@@ -10,6 +10,3 @@ obj-m				:=
 obj-n				:= dummy.o
 obj-				:=
 
-# CPU support
-
-obj-$(CONFIG_CPU_S3C6400_CLOCK)	+= s3c6400-clock.o