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/spitz_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/spitz_defconfig')
| -rw-r--r-- | arch/arm/configs/spitz_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig index 4df5b4db2aa0..745c68ffb885 100644 --- a/arch/arm/configs/spitz_defconfig +++ b/arch/arm/configs/spitz_defconfig | |||
| @@ -977,8 +977,8 @@ CONFIG_I2C_PXA=y | |||
| 977 | # Miscellaneous I2C Chip support | 977 | # Miscellaneous I2C Chip support |
| 978 | # | 978 | # |
| 979 | # CONFIG_DS1682 is not set | 979 | # CONFIG_DS1682 is not set |
| 980 | # CONFIG_AT24 is not set | 980 | # CONFIG_EEPROM_AT24 is not set |
| 981 | # CONFIG_SENSORS_EEPROM is not set | 981 | # CONFIG_EEPROM_LEGACY is not set |
| 982 | # CONFIG_SENSORS_PCF8574 is not set | 982 | # CONFIG_SENSORS_PCF8574 is not set |
| 983 | # CONFIG_PCF8575 is not set | 983 | # CONFIG_PCF8575 is not set |
| 984 | # CONFIG_SENSORS_PCA9539 is not set | 984 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -1003,7 +1003,7 @@ CONFIG_SPI_PXA2XX=y | |||
| 1003 | # | 1003 | # |
| 1004 | # SPI Protocol Masters | 1004 | # SPI Protocol Masters |
| 1005 | # | 1005 | # |
| 1006 | # CONFIG_SPI_AT25 is not set | 1006 | # CONFIG_EEPROM_AT25 is not set |
| 1007 | # CONFIG_SPI_SPIDEV is not set | 1007 | # CONFIG_SPI_SPIDEV is not set |
| 1008 | # CONFIG_SPI_TLE62X0 is not set | 1008 | # CONFIG_SPI_TLE62X0 is not set |
| 1009 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 1009 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |