diff -urpN -X linux-2.6.19-fix6/Documentation/dontdiff linux-2.6.19-fix6/arch/arm/mach-s3c2410/s3c2440.c linux-2.6.19-fix7/arch/arm/mach-s3c2410/s3c2440.c
--- linux-2.6.19-fix6/arch/arm/mach-s3c2410/s3c2440.c	2006-12-17 16:22:49.000000000 +0000
+++ linux-2.6.19-fix7/arch/arm/mach-s3c2410/s3c2440.c	2006-12-17 16:43:43.000000000 +0000
@@ -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 -urpN -X linux-2.6.19-fix6/Documentation/dontdiff linux-2.6.19-fix6/arch/arm/mach-s3c2410/s3c2440.h linux-2.6.19-fix7/arch/arm/mach-s3c2410/s3c2440.h
--- linux-2.6.19-fix6/arch/arm/mach-s3c2410/s3c2440.h	2006-12-17 16:33:31.000000000 +0000
+++ linux-2.6.19-fix7/arch/arm/mach-s3c2410/s3c2440.h	2006-12-17 16:44:04.000000000 +0000
@@ -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 -urpN -X linux-2.6.19-fix6/Documentation/dontdiff linux-2.6.19-fix6/arch/arm/mach-s3c2410/s3c2442.c linux-2.6.19-fix7/arch/arm/mach-s3c2410/s3c2442.c
--- linux-2.6.19-fix6/arch/arm/mach-s3c2410/s3c2442.c	2006-12-17 16:23:11.000000000 +0000
+++ linux-2.6.19-fix7/arch/arm/mach-s3c2410/s3c2442.c	2006-12-17 16:40:29.000000000 +0000
@@ -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,