diff options
| author | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
| commit | abcea2c322cef559ef2f108b4763d107a5ccc37f (patch) | |
| tree | 5fec7fec372f9bdb70703f6c77bfc49cda945442 /arch/arm/configs/ixp4xx_defconfig | |
| parent | 8118aea23c328fd4913b325af53fda9d530b1d56 (diff) | |
| parent | 6d831c6554e4f95083919914955a1a3a4a6acfa9 (diff) | |
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
Diffstat (limited to 'arch/arm/configs/ixp4xx_defconfig')
| -rw-r--r-- | arch/arm/configs/ixp4xx_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig index fc14932e3abd..95cd8dfb5f1e 100644 --- a/arch/arm/configs/ixp4xx_defconfig +++ b/arch/arm/configs/ixp4xx_defconfig | |||
| @@ -1083,7 +1083,7 @@ CONFIG_I2C_IXP4XX=y | |||
| 1083 | # CONFIG_SENSORS_DS1337 is not set | 1083 | # CONFIG_SENSORS_DS1337 is not set |
| 1084 | # CONFIG_SENSORS_DS1374 is not set | 1084 | # CONFIG_SENSORS_DS1374 is not set |
| 1085 | # CONFIG_DS1682 is not set | 1085 | # CONFIG_DS1682 is not set |
| 1086 | CONFIG_SENSORS_EEPROM=y | 1086 | CONFIG_EEPROM_LEGACY=y |
| 1087 | # CONFIG_SENSORS_PCF8574 is not set | 1087 | # CONFIG_SENSORS_PCF8574 is not set |
| 1088 | # CONFIG_SENSORS_PCA9539 is not set | 1088 | # CONFIG_SENSORS_PCA9539 is not set |
| 1089 | # CONFIG_SENSORS_PCF8591 is not set | 1089 | # CONFIG_SENSORS_PCF8591 is not set |