From 7cb479455635874a0cd6cc92f8b1eb73313f1e37 Mon Sep 17 00:00:00 2001
From: Krzysztof Helt <krzysztof.h1@wp.pl>
Date: Tue, 12 Dec 2006 15:02:32 +0100
Subject: [PATCH] --- yaml --- r: 44700 b: refs/heads/master c:
 0f7d667ba341337b77b31ce81be04b16b3964cf6 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/mach-s3c2410/s3c2410-dma.c | 6 ++++--
 trunk/arch/arm/mach-s3c2410/s3c2410-pm.c  | 6 ++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 33ef4470bc6d..efb972fcc6b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c041ffb36407897bbc3b7bf87d1fa856ce085cdf
+refs/heads/master: 0f7d667ba341337b77b31ce81be04b16b3964cf6
diff --git a/trunk/arch/arm/mach-s3c2410/s3c2410-dma.c b/trunk/arch/arm/mach-s3c2410/s3c2410-dma.c
index 824a8f7f1b3b..e67ba3911f11 100644
--- a/trunk/arch/arm/mach-s3c2410/s3c2410-dma.c
+++ b/trunk/arch/arm/mach-s3c2410/s3c2410-dma.c
@@ -132,6 +132,7 @@ static int s3c2410_dma_add(struct sys_device *sysdev)
 	return s3c24xx_dma_init_map(&s3c2410_dma_sel);
 }
 
+#if defined(CONFIG_CPU_S3C2410)
 static struct sysdev_driver s3c2410_dma_driver = {
 	.add	= s3c2410_dma_add,
 };
@@ -142,9 +143,10 @@ static int __init s3c2410_dma_init(void)
 }
 
 arch_initcall(s3c2410_dma_init);
+#endif
 
+#if defined(CONFIG_CPU_S3C2442)
 /* S3C2442 DMA contains the same selection table as the S3C2410 */
-
 static struct sysdev_driver s3c2442_dma_driver = {
 	.add	= s3c2410_dma_add,
 };
@@ -155,5 +157,5 @@ static int __init s3c2442_dma_init(void)
 }
 
 arch_initcall(s3c2442_dma_init);
-
+#endif
 
diff --git a/trunk/arch/arm/mach-s3c2410/s3c2410-pm.c b/trunk/arch/arm/mach-s3c2410/s3c2410-pm.c
index e546fe1379e7..8bb6e5e21f59 100644
--- a/trunk/arch/arm/mach-s3c2410/s3c2410-pm.c
+++ b/trunk/arch/arm/mach-s3c2410/s3c2410-pm.c
@@ -111,6 +111,7 @@ static int s3c2410_pm_add(struct sys_device *dev)
 	return 0;
 }
 
+#if defined(CONFIG_CPU_S3C2410)
 static struct sysdev_driver s3c2410_pm_driver = {
 	.add		= s3c2410_pm_add,
 	.resume		= s3c2410_pm_resume,
@@ -124,7 +125,9 @@ static int __init s3c2410_pm_drvinit(void)
 }
 
 arch_initcall(s3c2410_pm_drvinit);
+#endif
 
+#if defined(CONFIG_CPU_S3C2440)
 static struct sysdev_driver s3c2440_pm_driver = {
 	.add		= s3c2410_pm_add,
 	.resume		= s3c2410_pm_resume,
@@ -136,7 +139,9 @@ static int __init s3c2440_pm_drvinit(void)
 }
 
 arch_initcall(s3c2440_pm_drvinit);
+#endif
 
+#if defined(CONFIG_CPU_S3C2442)
 static struct sysdev_driver s3c2442_pm_driver = {
 	.add		= s3c2410_pm_add,
 	.resume		= s3c2410_pm_resume,
@@ -148,3 +153,4 @@ static int __init s3c2442_pm_drvinit(void)
 }
 
 arch_initcall(s3c2442_pm_drvinit);
+#endif