diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-22 17:59:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-22 17:59:49 +0100 |
| commit | 2702e0a46c2d28da92b32c9b068ee1291fc0de35 (patch) | |
| tree | c1e9868a4b91beeebd5f4e820588bc2ae8371911 /arch/powerpc/configs/chrp32_defconfig | |
| parent | 42bb8cc5e81028e217105299001070d57eb84ad7 (diff) | |
| parent | adfafefd104d840ee4461965f22624d77532675b (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'arch/powerpc/configs/chrp32_defconfig')
| -rw-r--r-- | arch/powerpc/configs/chrp32_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig index 63b3c2372ce..5094a65a449 100644 --- a/arch/powerpc/configs/chrp32_defconfig +++ b/arch/powerpc/configs/chrp32_defconfig @@ -941,8 +941,8 @@ CONFIG_I2C_ALGOBIT=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 |