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/mach-s3c2410/s3c2410-dma.c | |
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/mach-s3c2410/s3c2410-dma.c')
-rw-r--r-- | arch/arm/mach-s3c2410/s3c2410-dma.c | 6 |
1 files changed, 4 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 | ||