Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / arm / mach-s3c2440 / Kconfig

diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
index cd8e7de388f0c32b5828d268894b512aa53f45f6..a0cb2581894fa9fbe322347de25781e7b9a4ba81 100644 (file)
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@ -4,7 +4,6 @@
 
 config CPU_S3C2440
        bool
-       depends on ARCH_S3C2410
        select CPU_ARM920T
        select S3C_GPIO_PULL_UP
        select S3C2410_CLOCK
@@ -18,8 +17,8 @@ config CPU_S3C2440
 
 config CPU_S3C2442
        bool
-       depends on ARCH_S3C2410
        select CPU_ARM920T
+       select S3C_GPIO_PULL_DOWN
        select S3C2410_CLOCK
        select S3C2410_GPIO
        select S3C2410_PM if PM
@@ -30,7 +29,7 @@ config CPU_S3C2442
 
 config CPU_S3C244X
        bool
-       depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442)
+       depends on CPU_S3C2440 || CPU_S3C2442
        help
          Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems.
 
@@ -72,7 +71,7 @@ config S3C2440_PLL_16934400
 
 config S3C2440_DMA
        bool
-       depends on ARCH_S3C2410 && CPU_S3C24405B
+       depends on CPU_S3C2440
        help
          Support for S3C2440 specific DMA code5A
 
@@ -180,8 +179,10 @@ config MACH_MINI2440
        bool "MINI2440 development board"
        select CPU_S3C2440
        select EEPROM_AT24
+       select NEW_LEDS
+       select LEDS_CLASS
+       select LEDS_TRIGGER
        select LEDS_TRIGGER_BACKLIGHT
-       select SND_S3C24XX_SOC_S3C24XX_UDA134X
        select S3C_DEV_NAND
        select S3C_DEV_USB_HOST
        help