diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 11:38:55 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 11:38:55 +0100 |
commit | 891393745aad5c5acdb01b6ce61c08d4cc064649 (patch) | |
tree | 7687b8b94c4bc4ec8d5f1106ff8ff4d557b2fabf /arch/arm/configs/viper_defconfig | |
parent | a448720ca3248e8a7a426336885549d6e923fd8e (diff) | |
parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) |
Merge commit 'v2.6.29-rc4' into x86/cleanups
Diffstat (limited to 'arch/arm/configs/viper_defconfig')
-rw-r--r-- | arch/arm/configs/viper_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig index d01fecb8673..30f463d2fa8 100644 --- a/arch/arm/configs/viper_defconfig +++ b/arch/arm/configs/viper_defconfig @@ -860,8 +860,8 @@ CONFIG_I2C_PXA=y # Miscellaneous I2C Chip support # # CONFIG_DS1682 is not set -# CONFIG_AT24 is not set -# CONFIG_SENSORS_EEPROM is not set +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_LEGACY is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_PCF8575 is not set # CONFIG_SENSORS_PCA9539 is not set |