ARM: s3c24xx: don't select EEPROM_AT24

EEPROM_AT24 depends on both I2C and SYSFS. We have in the past
added I2C 'select' statements to avoid build problems with the
first, but we still get a warning because of the second:

warning: (MACH_DAVINCI_EVM && MACH_SFFSDR && MACH_DAVINCI_DM6467_EVM && MACH_DAVINCI_DM365_EVM && MACH_DAVINCI_DA830_EVM && MACH_MITYOMAPL138 && MACH_MINI2440) selects EEPROM_AT24 which has unmet direct dependencies (I2C && SYSFS)

This removes the 'select' statements again, and forces users to
enable the driver in their configuration files, as we do for
most other drivers.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig
index 9c93f565524819278e693bbcc59435045460ac4d..0b02e4f43c6a9618859b993373b5f77ac8dcc6f2 100644 (file)
--- a/arch/arm/configs/mini2440_defconfig
+++ b/arch/arm/configs/mini2440_defconfig
@@ -158,6 +158,7 @@ CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_S3C2410=y
 CONFIG_I2C_SIMTEC=y
+CONFIG_EEPROM_AT24=y
 CONFIG_SPI=y
 CONFIG_SPI_S3C24XX=y
 CONFIG_SPI_SPIDEV=y

diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig
index f3142369f594aebbc0efd1066574545d3485e93d..b3ade552a2a53d4e9c03b5a5ee0c836eab24ab92 100644 (file)
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@ -290,6 +290,7 @@ CONFIG_HW_RANDOM=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_S3C2410=y
 CONFIG_I2C_SIMTEC=y
+CONFIG_EEPROM_AT24=y
 CONFIG_SPI=y
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_S3C24XX=m

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index ef68ecb273964f7c237078752b555d326aa08056..c94ef77405ed2ffb09561e376736780c8265542e 100644 (file)
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -460,7 +460,6 @@ config MACH_AT2440EVB
 
 config MACH_MINI2440
        bool "MINI2440 development board"
-       select EEPROM_AT24 if I2C
        select LEDS_CLASS
        select LEDS_TRIGGERS
        select LEDS_TRIGGER_BACKLIGHT