Merge tag 'v3.15-rc1' into perf/urgent

[sfrench/cifs-2.6.git] / arch / arm / mach-s3c24xx / common.c

diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
index 64b6eda380a4dd2859de3337a22823b8e12ddcde..1bc8e73c94f9864d8d7cdfc715c33582f9718005 100644 (file)
--- a/arch/arm/mach-s3c24xx/common.c
+++ b/arch/arm/mach-s3c24xx/common.c
@@ -483,7 +483,7 @@ struct platform_device s3c2440_device_dma = {
 };
 #endif
 
-#if defined(CONFIG_CPUS_3C2443) || defined(CONFIG_CPU_S3C2416)
+#if defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416)
 static struct resource s3c2443_dma_resource[] = {
        [0] = DEFINE_RES_MEM(S3C24XX_PA_DMA, S3C24XX_SZ_DMA),
        [1] = DEFINE_RES_IRQ(IRQ_S3C2443_DMA0),