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/BF526-EZBRD_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/BF526-EZBRD_defconfig')
| -rw-r--r-- | arch/blackfin/configs/BF526-EZBRD_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig index 69f66c35b2a5..992424ff3153 100644 --- a/arch/blackfin/configs/BF526-EZBRD_defconfig +++ b/arch/blackfin/configs/BF526-EZBRD_defconfig | |||
| @@ -793,9 +793,9 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 | |||
| 793 | # Miscellaneous I2C Chip support | 793 | # Miscellaneous I2C Chip support |
| 794 | # | 794 | # |
| 795 | # CONFIG_DS1682 is not set | 795 | # CONFIG_DS1682 is not set |
| 796 | # CONFIG_AT24 is not set | 796 | # CONFIG_EEPROM_AT24 is not set |
| 797 | # CONFIG_SENSORS_AD5252 is not set | 797 | # CONFIG_SENSORS_AD5252 is not set |
| 798 | # CONFIG_SENSORS_EEPROM is not set | 798 | # CONFIG_EEPROM_LEGACY is not set |
| 799 | # CONFIG_SENSORS_PCF8574 is not set | 799 | # CONFIG_SENSORS_PCF8574 is not set |
| 800 | # CONFIG_PCF8575 is not set | 800 | # CONFIG_PCF8575 is not set |
| 801 | # CONFIG_SENSORS_PCA9539 is not set | 801 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -820,7 +820,7 @@ CONFIG_SPI_BFIN=y | |||
| 820 | # | 820 | # |
| 821 | # SPI Protocol Masters | 821 | # SPI Protocol Masters |
| 822 | # | 822 | # |
| 823 | # CONFIG_SPI_AT25 is not set | 823 | # CONFIG_EEPROM_AT25 is not set |
| 824 | # CONFIG_SPI_SPIDEV is not set | 824 | # CONFIG_SPI_SPIDEV is not set |
| 825 | # CONFIG_SPI_TLE62X0 is not set | 825 | # CONFIG_SPI_TLE62X0 is not set |
| 826 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 826 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |