diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 06:01:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 06:01:51 -0500 |
| commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch) | |
| tree | fc2efb59d627135ea2199a8a68415b162646b121 /arch/powerpc/configs/storcenter_defconfig | |
| parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/powerpc/configs/storcenter_defconfig')
| -rw-r--r-- | arch/powerpc/configs/storcenter_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig index b3f5671972a9..7eb16ab7b71b 100644 --- a/arch/powerpc/configs/storcenter_defconfig +++ b/arch/powerpc/configs/storcenter_defconfig | |||
| @@ -795,8 +795,8 @@ CONFIG_I2C_MPC=y | |||
| 795 | # Miscellaneous I2C Chip support | 795 | # Miscellaneous I2C Chip support |
| 796 | # | 796 | # |
| 797 | # CONFIG_DS1682 is not set | 797 | # CONFIG_DS1682 is not set |
| 798 | # CONFIG_AT24 is not set | 798 | # CONFIG_EEPROM_AT24 is not set |
| 799 | # CONFIG_SENSORS_EEPROM is not set | 799 | # CONFIG_EEPROM_LEGACY is not set |
| 800 | # CONFIG_SENSORS_PCF8574 is not set | 800 | # CONFIG_SENSORS_PCF8574 is not set |
| 801 | # CONFIG_PCF8575 is not set | 801 | # CONFIG_PCF8575 is not set |
| 802 | # CONFIG_SENSORS_PCA9539 is not set | 802 | # CONFIG_SENSORS_PCA9539 is not set |