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/cam60_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/cam60_defconfig')
| -rw-r--r-- | arch/arm/configs/cam60_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/cam60_defconfig b/arch/arm/configs/cam60_defconfig index f945105d6cd6..8448108347cf 100644 --- a/arch/arm/configs/cam60_defconfig +++ b/arch/arm/configs/cam60_defconfig | |||
| @@ -722,7 +722,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 722 | # CONFIG_SENSORS_DS1337 is not set | 722 | # CONFIG_SENSORS_DS1337 is not set |
| 723 | # CONFIG_SENSORS_DS1374 is not set | 723 | # CONFIG_SENSORS_DS1374 is not set |
| 724 | # CONFIG_DS1682 is not set | 724 | # CONFIG_DS1682 is not set |
| 725 | # CONFIG_SENSORS_EEPROM is not set | 725 | # CONFIG_EEPROM_LEGACY is not set |
| 726 | # CONFIG_SENSORS_PCF8574 is not set | 726 | # CONFIG_SENSORS_PCF8574 is not set |
| 727 | # CONFIG_SENSORS_PCA9539 is not set | 727 | # CONFIG_SENSORS_PCA9539 is not set |
| 728 | # CONFIG_SENSORS_PCF8591 is not set | 728 | # CONFIG_SENSORS_PCF8591 is not set |
| @@ -749,7 +749,7 @@ CONFIG_SPI_ATMEL=y | |||
| 749 | # | 749 | # |
| 750 | # SPI Protocol Masters | 750 | # SPI Protocol Masters |
| 751 | # | 751 | # |
| 752 | # CONFIG_SPI_AT25 is not set | 752 | # CONFIG_EEPROM_AT25 is not set |
| 753 | # CONFIG_SPI_SPIDEV is not set | 753 | # CONFIG_SPI_SPIDEV is not set |
| 754 | # CONFIG_SPI_TLE62X0 is not set | 754 | # CONFIG_SPI_TLE62X0 is not set |
| 755 | # CONFIG_W1 is not set | 755 | # CONFIG_W1 is not set |