diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-27 00:11:41 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-27 00:11:41 +0100 |
| commit | cfb901bf84fe22eb86525e9fb20675b53fb0462a (patch) | |
| tree | e1e710df2c1ba0da26b12f7487fdac6cedc7e166 /arch/sh/configs/r7785rp_defconfig | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff) | |
| parent | i2c: Warn on deprecated binding model use (diff) | |
| download | linux-cfb901bf84fe22eb86525e9fb20675b53fb0462a.tar.xz linux-cfb901bf84fe22eb86525e9fb20675b53fb0462a.zip | |
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/r7785rp_defconfig')
| -rw-r--r-- | arch/sh/configs/r7785rp_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig index ebdf0fc436e4..8defaa5f13b9 100644 --- a/arch/sh/configs/r7785rp_defconfig +++ b/arch/sh/configs/r7785rp_defconfig @@ -862,8 +862,8 @@ CONFIG_I2C_HIGHLANDER=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 |