Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/arm/mach-s3c2410/s3c2410-dma.c

+4 −2
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-s3c2410/s3c2410-pm.c

+6 −0
Original line number Diff line number Diff line
@@ -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