diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:20:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:20:13 +0100 |
| commit | d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de (patch) | |
| tree | 1e8c402df9b1154f4ca37eb5242f960ef7aab747 /arch/powerpc/configs/ppc64_defconfig | |
| parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
| parent | 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff) | |
Merge branch 'topic/quirk-cleanup' into topic/misc
Diffstat (limited to 'arch/powerpc/configs/ppc64_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index d4685d1c0be..88c6295b76c 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig @@ -1261,8 +1261,8 @@ CONFIG_I2C_PASEMI=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 |