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/sh/configs/shx3_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/sh/configs/shx3_defconfig')
| -rw-r--r-- | arch/sh/configs/shx3_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig index e0d7682e4f19..ed90a7e81099 100644 --- a/arch/sh/configs/shx3_defconfig +++ b/arch/sh/configs/shx3_defconfig | |||
| @@ -670,8 +670,8 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 670 | # Miscellaneous I2C Chip support | 670 | # Miscellaneous I2C Chip support |
| 671 | # | 671 | # |
| 672 | # CONFIG_DS1682 is not set | 672 | # CONFIG_DS1682 is not set |
| 673 | # CONFIG_AT24 is not set | 673 | # CONFIG_EEPROM_AT24 is not set |
| 674 | # CONFIG_SENSORS_EEPROM is not set | 674 | # CONFIG_EEPROM_LEGACY is not set |
| 675 | # CONFIG_SENSORS_PCF8574 is not set | 675 | # CONFIG_SENSORS_PCF8574 is not set |
| 676 | # CONFIG_PCF8575 is not set | 676 | # CONFIG_PCF8575 is not set |
| 677 | # CONFIG_SENSORS_PCA9539 is not set | 677 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -695,7 +695,7 @@ CONFIG_SPI_MASTER=y | |||
| 695 | # | 695 | # |
| 696 | # SPI Protocol Masters | 696 | # SPI Protocol Masters |
| 697 | # | 697 | # |
| 698 | # CONFIG_SPI_AT25 is not set | 698 | # CONFIG_EEPROM_AT25 is not set |
| 699 | # CONFIG_SPI_SPIDEV is not set | 699 | # CONFIG_SPI_SPIDEV is not set |
| 700 | # CONFIG_SPI_TLE62X0 is not set | 700 | # CONFIG_SPI_TLE62X0 is not set |
| 701 | # CONFIG_W1 is not set | 701 | # CONFIG_W1 is not set |