diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2006-12-12 09:02:32 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-12-17 19:15:42 -0500 |
commit | 0f7d667ba341337b77b31ce81be04b16b3964cf6 (patch) | |
tree | 0c22fceccd73a96418f0687439ff697d4f053808 /arch/arm | |
parent | c041ffb36407897bbc3b7bf87d1fa856ce085cdf (diff) |
[ARM] 4015/1: s3c2410 cpu ifdefs
The patch adds ifdefs around per cpu definitions. Otherwise, if
not all cpu types are selected, the kernel does not link.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-s3c2410/s3c2410-dma.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/s3c2410-pm.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2410-dma.c b/arch/arm/mach-s3c2410/s3c2410-dma.c index 824a8f7f1b3b..e67ba3911f11 100644 --- a/arch/arm/mach-s3c2410/s3c2410-dma.c +++ b/arch/arm/mach-s3c2410/s3c2410-dma.c | |||
@@ -132,6 +132,7 @@ static int s3c2410_dma_add(struct sys_device *sysdev) | |||
132 | return s3c24xx_dma_init_map(&s3c2410_dma_sel); | 132 | return s3c24xx_dma_init_map(&s3c2410_dma_sel); |
133 | } | 133 | } |
134 | 134 | ||
135 | #if defined(CONFIG_CPU_S3C2410) | ||
135 | static struct sysdev_driver s3c2410_dma_driver = { | 136 | static struct sysdev_driver s3c2410_dma_driver = { |
136 | .add = s3c2410_dma_add, | 137 | .add = s3c2410_dma_add, |
137 | }; | 138 | }; |
@@ -142,9 +143,10 @@ static int __init s3c2410_dma_init(void) | |||
142 | } | 143 | } |
143 | 144 | ||
144 | arch_initcall(s3c2410_dma_init); | 145 | arch_initcall(s3c2410_dma_init); |
146 | #endif | ||
145 | 147 | ||
148 | #if defined(CONFIG_CPU_S3C2442) | ||
146 | /* S3C2442 DMA contains the same selection table as the S3C2410 */ | 149 | /* S3C2442 DMA contains the same selection table as the S3C2410 */ |
147 | |||
148 | static struct sysdev_driver s3c2442_dma_driver = { | 150 | static struct sysdev_driver s3c2442_dma_driver = { |
149 | .add = s3c2410_dma_add, | 151 | .add = s3c2410_dma_add, |
150 | }; | 152 | }; |
@@ -155,5 +157,5 @@ static int __init s3c2442_dma_init(void) | |||
155 | } | 157 | } |
156 | 158 | ||
157 | arch_initcall(s3c2442_dma_init); | 159 | arch_initcall(s3c2442_dma_init); |
158 | 160 | #endif | |
159 | 161 | ||
diff --git a/arch/arm/mach-s3c2410/s3c2410-pm.c b/arch/arm/mach-s3c2410/s3c2410-pm.c index e546fe1379e7..8bb6e5e21f59 100644 --- a/arch/arm/mach-s3c2410/s3c2410-pm.c +++ b/arch/arm/mach-s3c2410/s3c2410-pm.c | |||
@@ -111,6 +111,7 @@ static int s3c2410_pm_add(struct sys_device *dev) | |||
111 | return 0; | 111 | return 0; |
112 | } | 112 | } |
113 | 113 | ||
114 | #if defined(CONFIG_CPU_S3C2410) | ||
114 | static struct sysdev_driver s3c2410_pm_driver = { | 115 | static struct sysdev_driver s3c2410_pm_driver = { |
115 | .add = s3c2410_pm_add, | 116 | .add = s3c2410_pm_add, |
116 | .resume = s3c2410_pm_resume, | 117 | .resume = s3c2410_pm_resume, |
@@ -124,7 +125,9 @@ static int __init s3c2410_pm_drvinit(void) | |||
124 | } | 125 | } |
125 | 126 | ||
126 | arch_initcall(s3c2410_pm_drvinit); | 127 | arch_initcall(s3c2410_pm_drvinit); |
128 | #endif | ||
127 | 129 | ||
130 | #if defined(CONFIG_CPU_S3C2440) | ||
128 | static struct sysdev_driver s3c2440_pm_driver = { | 131 | static struct sysdev_driver s3c2440_pm_driver = { |
129 | .add = s3c2410_pm_add, | 132 | .add = s3c2410_pm_add, |
130 | .resume = s3c2410_pm_resume, | 133 | .resume = s3c2410_pm_resume, |
@@ -136,7 +139,9 @@ static int __init s3c2440_pm_drvinit(void) | |||
136 | } | 139 | } |
137 | 140 | ||
138 | arch_initcall(s3c2440_pm_drvinit); | 141 | arch_initcall(s3c2440_pm_drvinit); |
142 | #endif | ||
139 | 143 | ||
144 | #if defined(CONFIG_CPU_S3C2442) | ||
140 | static struct sysdev_driver s3c2442_pm_driver = { | 145 | static struct sysdev_driver s3c2442_pm_driver = { |
141 | .add = s3c2410_pm_add, | 146 | .add = s3c2410_pm_add, |
142 | .resume = s3c2410_pm_resume, | 147 | .resume = s3c2410_pm_resume, |
@@ -148,3 +153,4 @@ static int __init s3c2442_pm_drvinit(void) | |||
148 | } | 153 | } |
149 | 154 | ||
150 | arch_initcall(s3c2442_pm_drvinit); | 155 | arch_initcall(s3c2442_pm_drvinit); |
156 | #endif | ||