diffs from linux-2.6.18-rmkdevel2-bjd1 to linux-2.6.18-rmkdevel2-bjd2
generating diff for arch/arm/mach-s3c2410
diff -urpN -X linux-2.6.18-rmkdevel2-bjd1/Documentation/dontdiff linux-2.6.18-rmkdevel2-bjd1/arch/arm/mach-s3c2410/s3c2410-dma.c linux-2.6.18-rmkdevel2-bjd2/arch/arm/mach-s3c2410/s3c2410-dma.c
--- linux-2.6.18-rmkdevel2-bjd1/arch/arm/mach-s3c2410/s3c2410-dma.c	2006-09-22 15:08:37.000000000 +0100
+++ linux-2.6.18-rmkdevel2-bjd2/arch/arm/mach-s3c2410/s3c2410-dma.c	2006-09-22 16:42:36.000000000 +0100
@@ -131,6 +131,7 @@ static int s3c2410_dma_add(struct sys_de
 	return s3c24xx_dma_init_map(&s3c2410_dma_sel);
 }
 
+#ifdef CONFIG_CPU_S3C2410
 static struct sysdev_driver s3c2410_dma_driver = {
 	.add	= s3c2410_dma_add,
 };
@@ -141,9 +142,11 @@ static int __init s3c2410_dma_init(void)
 }
 
 arch_initcall(s3c2410_dma_init);
+#endif
 
 /* S3C2442 DMA contains the same selection table as the S3C2410 */
 
+#ifdef CONFIG_CPU_S3C2442
 static struct sysdev_driver s3c2442_dma_driver = {
 	.add	= s3c2410_dma_add,
 };
@@ -154,5 +157,4 @@ static int __init s3c2442_dma_init(void)
 }
 
 arch_initcall(s3c2442_dma_init);
-
-
+#endif
diff -urpN -X linux-2.6.18-rmkdevel2-bjd1/Documentation/dontdiff linux-2.6.18-rmkdevel2-bjd1/arch/arm/mach-s3c2410/s3c2410-pm.c linux-2.6.18-rmkdevel2-bjd2/arch/arm/mach-s3c2410/s3c2410-pm.c
--- linux-2.6.18-rmkdevel2-bjd1/arch/arm/mach-s3c2410/s3c2410-pm.c	2006-09-22 15:08:37.000000000 +0100
+++ linux-2.6.18-rmkdevel2-bjd2/arch/arm/mach-s3c2410/s3c2410-pm.c	2006-09-22 16:41:23.000000000 +0100
@@ -72,20 +72,21 @@ static int s3c2410_pm_add(struct sys_dev
 	return 0;
 }
 
+#ifdef CONFIG_CPU_S3C2410
 static struct sysdev_driver s3c2410_pm_driver = {
 	.add		= s3c2410_pm_add,
 	.resume		= s3c2410_pm_resume,
 };
 
-/* register ourselves */
-
 static int __init s3c2410_pm_drvinit(void)
 {
 	return sysdev_driver_register(&s3c2410_sysclass, &s3c2410_pm_driver);
 }
 
 arch_initcall(s3c2410_pm_drvinit);
+#endif
 
+#ifdef CONFIG_CPU_S3C2440
 static struct sysdev_driver s3c2440_pm_driver = {
 	.add		= s3c2410_pm_add,
 	.resume		= s3c2410_pm_resume,
@@ -97,7 +98,9 @@ static int __init s3c2440_pm_drvinit(voi
 }
 
 arch_initcall(s3c2440_pm_drvinit);
+#endif
 
+#ifdef CONFIG_CPU_S3C2442
 static struct sysdev_driver s3c2442_pm_driver = {
 	.add		= s3c2410_pm_add,
 	.resume		= s3c2410_pm_resume,
@@ -109,3 +112,5 @@ static int __init s3c2442_pm_drvinit(voi
 }
 
 arch_initcall(s3c2442_pm_drvinit);
+#endif
+