diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 18:11:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 18:11:41 -0500 |
| commit | cfb901bf84fe22eb86525e9fb20675b53fb0462a (patch) | |
| tree | e1e710df2c1ba0da26b12f7487fdac6cedc7e166 /arch/arm/configs/picotux200_defconfig | |
| parent | 2034563ca323ee45f37a32911550d21c1f1e9626 (diff) | |
| parent | 5fb4523afbffae5a5cec4989ee4c9fbc3dbdef33 (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/arm/configs/picotux200_defconfig')
| -rw-r--r-- | arch/arm/configs/picotux200_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/picotux200_defconfig b/arch/arm/configs/picotux200_defconfig index 59e4463c2da2..9018f0f298aa 100644 --- a/arch/arm/configs/picotux200_defconfig +++ b/arch/arm/configs/picotux200_defconfig | |||
| @@ -744,7 +744,7 @@ CONFIG_I2C_GPIO=m | |||
| 744 | # | 744 | # |
| 745 | CONFIG_SENSORS_DS1337=m | 745 | CONFIG_SENSORS_DS1337=m |
| 746 | CONFIG_SENSORS_DS1374=m | 746 | CONFIG_SENSORS_DS1374=m |
| 747 | CONFIG_SENSORS_EEPROM=m | 747 | CONFIG_EEPROM_LEGACY=m |
| 748 | CONFIG_SENSORS_PCF8574=m | 748 | CONFIG_SENSORS_PCF8574=m |
| 749 | CONFIG_SENSORS_PCA9539=m | 749 | CONFIG_SENSORS_PCA9539=m |
| 750 | CONFIG_SENSORS_PCF8591=m | 750 | CONFIG_SENSORS_PCF8591=m |