aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/configs/migor_defconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-26 15:11:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-26 15:11:41 -0800
commitcfb901bf84fe22eb86525e9fb20675b53fb0462a (patch)
treee1e710df2c1ba0da26b12f7487fdac6cedc7e166 /arch/sh/configs/migor_defconfig
parent2034563ca323ee45f37a32911550d21c1f1e9626 (diff)
parent5fb4523afbffae5a5cec4989ee4c9fbc3dbdef33 (diff)
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c: Warn on deprecated binding model use eeprom: More consistent symbol names eeprom: Move 93cx6 eeprom driver to /drivers/misc/eeprom spi: Move at25 (for SPI eeproms) to /drivers/misc/eeprom i2c: Move old eeprom driver to /drivers/misc/eeprom i2c: Move at24 to drivers/misc/eeprom i2c: Quilt tree has moved i2c: Delete many unused adapter IDs i2c: Delete 10 unused driver IDs
Diffstat (limited to 'arch/sh/configs/migor_defconfig')
-rw-r--r--arch/sh/configs/migor_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig
index 76380ce972b..7758263514b 100644
--- a/arch/sh/configs/migor_defconfig
+++ b/arch/sh/configs/migor_defconfig
@@ -701,8 +701,8 @@ CONFIG_I2C_SH_MOBILE=y
# Miscellaneous I2C Chip support
#
# CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_LEGACY is not set
# CONFIG_SENSORS_PCF8574 is not set
# CONFIG_PCF8575 is not set
# CONFIG_SENSORS_PCA9539 is not set