diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
| commit | 7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (patch) | |
| tree | 0ad0ad3f3dcb6f9edf26dde42ba625053dddf54f /arch/powerpc/configs/ppc6xx_defconfig | |
| parent | 0d688da5505d77bcef2441e0a22d8cc26459702d (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/powerpc/configs/ppc6xx_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ppc6xx_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index 01f05ec5abf3..7d044dfd9236 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig | |||
| @@ -1801,8 +1801,8 @@ CONFIG_I2C_STUB=m | |||
| 1801 | # Miscellaneous I2C Chip support | 1801 | # Miscellaneous I2C Chip support |
| 1802 | # | 1802 | # |
| 1803 | # CONFIG_DS1682 is not set | 1803 | # CONFIG_DS1682 is not set |
| 1804 | CONFIG_AT24=m | 1804 | CONFIG_EEPROM_AT24=m |
| 1805 | CONFIG_SENSORS_EEPROM=m | 1805 | CONFIG_EEPROM_LEGACY=m |
| 1806 | CONFIG_SENSORS_PCF8574=m | 1806 | CONFIG_SENSORS_PCF8574=m |
| 1807 | CONFIG_PCF8575=m | 1807 | CONFIG_PCF8575=m |
| 1808 | CONFIG_SENSORS_PCA9539=m | 1808 | CONFIG_SENSORS_PCA9539=m |