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/mips/configs/msp71xx_defconfig | |
| parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/mips/configs/msp71xx_defconfig')
| -rw-r--r-- | arch/mips/configs/msp71xx_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/configs/msp71xx_defconfig b/arch/mips/configs/msp71xx_defconfig index dd13db4d0fb9..84d6491b3d41 100644 --- a/arch/mips/configs/msp71xx_defconfig +++ b/arch/mips/configs/msp71xx_defconfig | |||
| @@ -929,7 +929,7 @@ CONFIG_I2C_PMCMSP=y | |||
| 929 | # | 929 | # |
| 930 | # CONFIG_SENSORS_DS1337 is not set | 930 | # CONFIG_SENSORS_DS1337 is not set |
| 931 | # CONFIG_SENSORS_DS1374 is not set | 931 | # CONFIG_SENSORS_DS1374 is not set |
| 932 | # CONFIG_SENSORS_EEPROM is not set | 932 | # CONFIG_EEPROM_LEGACY is not set |
| 933 | # CONFIG_SENSORS_PCF8574 is not set | 933 | # CONFIG_SENSORS_PCF8574 is not set |
| 934 | CONFIG_PMCTWILED=y | 934 | CONFIG_PMCTWILED=y |
| 935 | # CONFIG_SENSORS_PCA9539 is not set | 935 | # CONFIG_SENSORS_PCA9539 is not set |