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/emma2rh_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/emma2rh_defconfig')
| -rw-r--r-- | arch/mips/configs/emma2rh_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/configs/emma2rh_defconfig b/arch/mips/configs/emma2rh_defconfig index 634bb4eaf132..fea9bc9865a3 100644 --- a/arch/mips/configs/emma2rh_defconfig +++ b/arch/mips/configs/emma2rh_defconfig | |||
| @@ -996,7 +996,7 @@ CONFIG_I2C_CHARDEV=y | |||
| 996 | # | 996 | # |
| 997 | # CONFIG_SENSORS_DS1337 is not set | 997 | # CONFIG_SENSORS_DS1337 is not set |
| 998 | # CONFIG_SENSORS_DS1374 is not set | 998 | # CONFIG_SENSORS_DS1374 is not set |
| 999 | # CONFIG_SENSORS_EEPROM is not set | 999 | # CONFIG_EEPROM_LEGACY is not set |
| 1000 | # CONFIG_SENSORS_PCF8574 is not set | 1000 | # CONFIG_SENSORS_PCF8574 is not set |
| 1001 | # CONFIG_SENSORS_PCA9539 is not set | 1001 | # CONFIG_SENSORS_PCA9539 is not set |
| 1002 | # CONFIG_SENSORS_PCF8591 is not set | 1002 | # CONFIG_SENSORS_PCF8591 is not set |