Commit 0f7d667b authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Russell King

[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: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c041ffb3
...@@ -132,6 +132,7 @@ static int s3c2410_dma_add(struct sys_device *sysdev) ...@@ -132,6 +132,7 @@ static int s3c2410_dma_add(struct sys_device *sysdev)
return s3c24xx_dma_init_map(&s3c2410_dma_sel); return s3c24xx_dma_init_map(&s3c2410_dma_sel);
} }
#if defined(CONFIG_CPU_S3C2410)
static struct sysdev_driver s3c2410_dma_driver = { static struct sysdev_driver s3c2410_dma_driver = {
.add = s3c2410_dma_add, .add = s3c2410_dma_add,
}; };
...@@ -142,9 +143,10 @@ static int __init s3c2410_dma_init(void) ...@@ -142,9 +143,10 @@ static int __init s3c2410_dma_init(void)
} }
arch_initcall(s3c2410_dma_init); arch_initcall(s3c2410_dma_init);
#endif
#if defined(CONFIG_CPU_S3C2442)
/* S3C2442 DMA contains the same selection table as the S3C2410 */ /* S3C2442 DMA contains the same selection table as the S3C2410 */
static struct sysdev_driver s3c2442_dma_driver = { static struct sysdev_driver s3c2442_dma_driver = {
.add = s3c2410_dma_add, .add = s3c2410_dma_add,
}; };
...@@ -155,5 +157,5 @@ static int __init s3c2442_dma_init(void) ...@@ -155,5 +157,5 @@ static int __init s3c2442_dma_init(void)
} }
arch_initcall(s3c2442_dma_init); arch_initcall(s3c2442_dma_init);
#endif
...@@ -111,6 +111,7 @@ static int s3c2410_pm_add(struct sys_device *dev) ...@@ -111,6 +111,7 @@ static int s3c2410_pm_add(struct sys_device *dev)
return 0; return 0;
} }
#if defined(CONFIG_CPU_S3C2410)
static struct sysdev_driver s3c2410_pm_driver = { static struct sysdev_driver s3c2410_pm_driver = {
.add = s3c2410_pm_add, .add = s3c2410_pm_add,
.resume = s3c2410_pm_resume, .resume = s3c2410_pm_resume,
...@@ -124,7 +125,9 @@ static int __init s3c2410_pm_drvinit(void) ...@@ -124,7 +125,9 @@ static int __init s3c2410_pm_drvinit(void)
} }
arch_initcall(s3c2410_pm_drvinit); arch_initcall(s3c2410_pm_drvinit);
#endif
#if defined(CONFIG_CPU_S3C2440)
static struct sysdev_driver s3c2440_pm_driver = { static struct sysdev_driver s3c2440_pm_driver = {
.add = s3c2410_pm_add, .add = s3c2410_pm_add,
.resume = s3c2410_pm_resume, .resume = s3c2410_pm_resume,
...@@ -136,7 +139,9 @@ static int __init s3c2440_pm_drvinit(void) ...@@ -136,7 +139,9 @@ static int __init s3c2440_pm_drvinit(void)
} }
arch_initcall(s3c2440_pm_drvinit); arch_initcall(s3c2440_pm_drvinit);
#endif
#if defined(CONFIG_CPU_S3C2442)
static struct sysdev_driver s3c2442_pm_driver = { static struct sysdev_driver s3c2442_pm_driver = {
.add = s3c2410_pm_add, .add = s3c2410_pm_add,
.resume = s3c2410_pm_resume, .resume = s3c2410_pm_resume,
...@@ -148,3 +153,4 @@ static int __init s3c2442_pm_drvinit(void) ...@@ -148,3 +153,4 @@ static int __init s3c2442_pm_drvinit(void)
} }
arch_initcall(s3c2442_pm_drvinit); arch_initcall(s3c2442_pm_drvinit);
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment