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

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

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index bb1fa603217961a7e86e4bd294aa07d1b90bde3d..40cf50b9940cb13b02ab34173d479ac26cdcfbe9 100644 (file)
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -12,7 +12,7 @@ if ARCH_S3C24XX
 config PLAT_S3C24XX
        def_bool y
        select ARCH_REQUIRE_GPIOLIB
-       select NO_IOPORT
+       select NO_IOPORT_MAP
        select S3C_DEV_NAND
        select IRQ_DOMAIN
        help
@@ -536,7 +536,7 @@ config MACH_AT2440EVB
 
 config MACH_MINI2440
        bool "MINI2440 development board"
-       select EEPROM_AT24
+       select EEPROM_AT24 if I2C
        select LEDS_CLASS
        select LEDS_TRIGGERS
        select LEDS_TRIGGER_BACKLIGHT
@@ -571,7 +571,7 @@ config MACH_OSIRIS
 config MACH_OSIRIS_DVS
        tristate "Simtec IM2440D20 (OSIRIS) Dynamic Voltage Scaling driver"
        depends on MACH_OSIRIS
-       select TPS65010
+       depends on TPS65010
        help
          Say Y/M here if you want to have dynamic voltage scaling support
          on the Simtec IM2440D20 (OSIRIS) module via the TPS65011.