diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 17:50:57 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 17:50:57 -0500 |
| commit | 9b7ed8faa034fc2d350e2eff5c68680eb5c43a07 (patch) | |
| tree | 5c94c34ad30e312604c1ce4f08ab6631b64a94f5 /arch/mips/configs/emma2rh_defconfig | |
| parent | 6522869c34664dd5f05a0a327e93915b1281c90d (diff) | |
| parent | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (diff) | |
Merge branch 'core/percpu' into x86/paravirt
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 |