ARM: S3C64XX: Merge s3c6400-init.c into cpu.c

Since this file is small, and is compiled for both systems in this
architecture merge it into the cpu support file and remove the original
instead of moving it.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

2 files changed, 6 insertions, 2 deletions

diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 7c9cd9a9901a..33d82b1c9eff 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -7,14 +7,12 @@
 
 config CPU_S3C6400
         bool
-        select CPU_S3C6400_INIT
         select CPU_S3C6400_CLOCK
         help
           Enable S3C6400 CPU support
 
 config CPU_S3C6410
         bool
-        select CPU_S3C6400_INIT
         select CPU_S3C6400_CLOCK
         help
           Enable S3C6410 CPU support
diff --git a/arch/arm/mach-s3c64xx/cpu.c b/arch/arm/mach-s3c64xx/cpu.c
index 410d688a6910..374e45e566b8 100644
--- a/arch/arm/mach-s3c64xx/cpu.c
+++ b/arch/arm/mach-s3c64xx/cpu.c
@@ -129,6 +129,12 @@ static struct sys_device s3c64xx_sysdev = {
         .cls    = &s3c64xx_sysclass,
 };
 
+/* uart registration process */
+
+void __init s3c6400_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)
+{
+        s3c24xx_init_uartdevs("s3c6400-uart", s3c64xx_uart_resources, cfg, no);
+}
 
 /* read cpu identification code */