1 files changed, 6 insertions, 16 deletions

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 37f513d1588e..8d5fa6ece014 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -36,7 +36,6 @@ config CPU_S3C2410
 
 config CPU_S3C2412
         bool "SAMSUNG S3C2412"
-        depends on ARCH_S3C24XX
         select CPU_ARM926T
         select CPU_LLSERIAL_S3C2440
         select S3C2412_DMA if S3C24XX_DMA
@@ -46,7 +45,6 @@ config CPU_S3C2412
 
 config CPU_S3C2416
         bool "SAMSUNG S3C2416/S3C2450"
-        depends on ARCH_S3C24XX
         select CPU_ARM926T
         select CPU_LLSERIAL_S3C2440
         select S3C2416_PM if PM
@@ -81,7 +79,6 @@ config CPU_S3C244X
 
 config CPU_S3C2443
         bool "SAMSUNG S3C2443"
-        depends on ARCH_S3C24XX
         select CPU_ARM920T
         select CPU_LLSERIAL_S3C2440
         select S3C2443_COMMON
@@ -133,7 +130,6 @@ config S3C24XX_SETUP_TS
 
 config S3C24XX_DMA
         bool "S3C2410 DMA support"
-        depends on ARCH_S3C24XX
         select S3C_DMA
         help
           S3C2410 DMA support. This is needed for drivers like sound which
@@ -142,7 +138,7 @@ config S3C24XX_DMA
 
 config S3C2410_DMA_DEBUG
         bool "S3C2410 DMA support debug"
-        depends on ARCH_S3C24XX && S3C2410_DMA
+        depends on S3C2410_DMA
         help
           Enable debugging output for the DMA code. This option sends info
           to the kernel log, at priority KERN_DEBUG.
@@ -233,7 +229,7 @@ if CPU_S3C2410
 
 config S3C2410_CPUFREQ
         bool
-        depends on CPU_FREQ_S3C24XX && CPU_S3C2410
+        depends on CPU_FREQ_S3C24XX
         select S3C2410_CPUFREQ_UTILS
         help
           CPU Frequency scaling support for S3C2410
@@ -320,7 +316,6 @@ config PM_H1940
 
 config MACH_N30
         bool "Acer N30 family"
-        select MACH_N35
         select S3C_DEV_NAND
         select S3C_DEV_USB_HOST
         help
@@ -380,14 +375,13 @@ if CPU_S3C2412
 
 config CPU_S3C2412_ONLY
         bool
-        depends on ARCH_S3C24XX && !CPU_S3C2410 && \
-                   !CPU_S3C2416 && !CPU_S3C2440 && !CPU_S3C2442 && \
-                   !CPU_S3C2443 && CPU_S3C2412
+        depends on !CPU_S3C2410 && !CPU_S3C2416 && !CPU_S3C2440 && \
+                   !CPU_S3C2442 && !CPU_S3C2443
         default y
 
 config S3C2412_CPUFREQ
         bool
-        depends on CPU_FREQ_S3C24XX && CPU_S3C2412
+        depends on CPU_FREQ_S3C24XX
         default y
         select S3C2412_IOTIMING
         help
@@ -642,7 +636,6 @@ comment "S3C2442 Boards"
 config MACH_NEO1973_GTA02
         bool "Openmoko GTA02 / Freerunner phone"
         select I2C
-        select MACH_NEO1973
         select MFD_PCF50633
         select PCF50633_GPIO
         select POWER_SUPPLY
@@ -663,10 +656,7 @@ config MACH_RX1950
         help
            Say Y here if you're using HP iPAQ rx1950
 
-config SMDK2440_CPU2442
-        bool "SMDM2440 with S3C2442 CPU module"
-
-endif   # CPU_S3C2440
+endif   # CPU_S3C2442
 
 if CPU_S3C2443 || CPU_S3C2416