diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 11:20:13 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 11:20:13 -0500 |
| commit | d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de (patch) | |
| tree | 1e8c402df9b1154f4ca37eb5242f960ef7aab747 /arch/powerpc/configs/52xx/motionpro_defconfig | |
| parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
| parent | 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff) | |
Merge branch 'topic/quirk-cleanup' into topic/misc
Diffstat (limited to 'arch/powerpc/configs/52xx/motionpro_defconfig')
| -rw-r--r-- | arch/powerpc/configs/52xx/motionpro_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig index 3c0d4e561726..d081e0031057 100644 --- a/arch/powerpc/configs/52xx/motionpro_defconfig +++ b/arch/powerpc/configs/52xx/motionpro_defconfig | |||
| @@ -629,8 +629,8 @@ CONFIG_I2C_MPC=y | |||
| 629 | # Miscellaneous I2C Chip support | 629 | # Miscellaneous I2C Chip support |
| 630 | # | 630 | # |
| 631 | # CONFIG_DS1682 is not set | 631 | # CONFIG_DS1682 is not set |
| 632 | # CONFIG_AT24 is not set | 632 | # CONFIG_EEPROM_AT24 is not set |
| 633 | CONFIG_SENSORS_EEPROM=y | 633 | CONFIG_EEPROM_LEGACY=y |
| 634 | # CONFIG_SENSORS_PCF8574 is not set | 634 | # CONFIG_SENSORS_PCF8574 is not set |
| 635 | # CONFIG_PCF8575 is not set | 635 | # CONFIG_PCF8575 is not set |
| 636 | # CONFIG_SENSORS_PCA9539 is not set | 636 | # CONFIG_SENSORS_PCA9539 is not set |