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/blackfin/configs/SRV1_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/blackfin/configs/SRV1_defconfig')
| -rw-r--r-- | arch/blackfin/configs/SRV1_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/configs/SRV1_defconfig b/arch/blackfin/configs/SRV1_defconfig index 7c8250d6fa6..fa580affc9d 100644 --- a/arch/blackfin/configs/SRV1_defconfig +++ b/arch/blackfin/configs/SRV1_defconfig | |||
| @@ -798,7 +798,7 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 | |||
| 798 | # CONFIG_SENSORS_DS1337 is not set | 798 | # CONFIG_SENSORS_DS1337 is not set |
| 799 | # CONFIG_SENSORS_DS1374 is not set | 799 | # CONFIG_SENSORS_DS1374 is not set |
| 800 | # CONFIG_SENSORS_AD5252 is not set | 800 | # CONFIG_SENSORS_AD5252 is not set |
| 801 | # CONFIG_SENSORS_EEPROM is not set | 801 | # CONFIG_EEPROM_LEGACY is not set |
| 802 | # CONFIG_SENSORS_PCF8574 is not set | 802 | # CONFIG_SENSORS_PCF8574 is not set |
| 803 | # CONFIG_SENSORS_PCF8575 is not set | 803 | # CONFIG_SENSORS_PCF8575 is not set |
| 804 | # CONFIG_SENSORS_PCA9543 is not set | 804 | # CONFIG_SENSORS_PCA9543 is not set |
| @@ -826,7 +826,7 @@ CONFIG_SPI_BFIN=y | |||
| 826 | # | 826 | # |
| 827 | # SPI Protocol Masters | 827 | # SPI Protocol Masters |
| 828 | # | 828 | # |
| 829 | CONFIG_SPI_AT25=m | 829 | CONFIG_EEPROM_AT25=m |
| 830 | # CONFIG_SPI_SPIDEV is not set | 830 | # CONFIG_SPI_SPIDEV is not set |
| 831 | 831 | ||
| 832 | # | 832 | # |