From 4cb02e6499a95d9dee9cdf711201f39c892b4663 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Sun, 17 Dec 2006 23:32:21 +0100
Subject: [PATCH] --- yaml --- r: 44693 b: refs/heads/master c:
 994adcc36d8c2133fce01f4d3fe4e41007555913 h: refs/heads/master i:   44691:
 cbb60d521cbbac2f01d9644b9156ea440aac2ba9 v: v3

---
 [refs]                                |  2 +-
 trunk/arch/arm/mach-s3c2410/s3c2440.c |  8 --------
 trunk/arch/arm/mach-s3c2410/s3c2440.h | 11 -----------
 trunk/arch/arm/mach-s3c2410/s3c2442.c | 19 -------------------
 4 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/[refs] b/[refs]
index 23030bf56c64..916349f60cc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92211ac71e189942968af57e5d0aed30083760ef
+refs/heads/master: 994adcc36d8c2133fce01f4d3fe4e41007555913
diff --git a/trunk/arch/arm/mach-s3c2410/s3c2440.c b/trunk/arch/arm/mach-s3c2410/s3c2440.c
index b91b11437449..344eb27cca48 100644
--- a/trunk/arch/arm/mach-s3c2410/s3c2440.c
+++ b/trunk/arch/arm/mach-s3c2410/s3c2440.c
@@ -29,17 +29,9 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-gpioj.h>
-#include <asm/arch/regs-dsc.h>
-
 #include "s3c2440.h"
-#include "clock.h"
 #include "devs.h"
 #include "cpu.h"
-#include "pm.h"
 
 static struct sys_device s3c2440_sysdev = {
 	.cls		= &s3c2440_sysclass,
diff --git a/trunk/arch/arm/mach-s3c2410/s3c2440.h b/trunk/arch/arm/mach-s3c2410/s3c2440.h
index a75616f0d3fa..dcd316076c59 100644
--- a/trunk/arch/arm/mach-s3c2410/s3c2440.h
+++ b/trunk/arch/arm/mach-s3c2410/s3c2440.h
@@ -11,18 +11,7 @@
 */
 
 #ifdef CONFIG_CPU_S3C2440
-
 extern  int s3c2440_init(void);
-
-extern void s3c2440_map_io(struct map_desc *mach_desc, int size);
-
-extern void s3c2440_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
-extern void s3c2440_init_clocks(int xtal);
-
 #else
-#define s3c2440_init_clocks NULL
-#define s3c2440_init_uarts NULL
-#define s3c2440_map_io NULL
 #define s3c2440_init NULL
 #endif
diff --git a/trunk/arch/arm/mach-s3c2410/s3c2442.c b/trunk/arch/arm/mach-s3c2410/s3c2442.c
index e593cb058b16..428732ee68c4 100644
--- a/trunk/arch/arm/mach-s3c2410/s3c2442.c
+++ b/trunk/arch/arm/mach-s3c2410/s3c2442.c
@@ -16,30 +16,11 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/init.h>
-#include <linux/platform_device.h>
 #include <linux/serial_core.h>
 #include <linux/sysdev.h>
-#include <linux/clk.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <asm/hardware.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-gpioj.h>
-#include <asm/arch/regs-dsc.h>
 
 #include "s3c2442.h"
-#include "clock.h"
-#include "devs.h"
 #include "cpu.h"
-#include "pm.h"
 
 static struct sys_device s3c2442_sysdev = {
 	.cls		= &s3c2442_sysclass,