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/pnx8335-stb225_defconfig | |
| parent | 6522869c34664dd5f05a0a327e93915b1281c90d (diff) | |
| parent | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (diff) | |
Merge branch 'core/percpu' into x86/paravirt
Diffstat (limited to 'arch/mips/configs/pnx8335-stb225_defconfig')
| -rw-r--r-- | arch/mips/configs/pnx8335-stb225_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/configs/pnx8335-stb225_defconfig b/arch/mips/configs/pnx8335-stb225_defconfig index d9536522cff5..2728caa6c2fb 100644 --- a/arch/mips/configs/pnx8335-stb225_defconfig +++ b/arch/mips/configs/pnx8335-stb225_defconfig | |||
| @@ -640,8 +640,8 @@ CONFIG_I2C_CHARDEV=y | |||
| 640 | # Miscellaneous I2C Chip support | 640 | # Miscellaneous I2C Chip support |
| 641 | # | 641 | # |
| 642 | # CONFIG_DS1682 is not set | 642 | # CONFIG_DS1682 is not set |
| 643 | # CONFIG_AT24 is not set | 643 | # CONFIG_EEPROM_AT24 is not set |
| 644 | # CONFIG_SENSORS_EEPROM is not set | 644 | # CONFIG_EEPROM_LEGACY is not set |
| 645 | # CONFIG_SENSORS_PCF8574 is not set | 645 | # CONFIG_SENSORS_PCF8574 is not set |
| 646 | # CONFIG_PCF8575 is not set | 646 | # CONFIG_PCF8575 is not set |
| 647 | # CONFIG_SENSORS_PCA9539 is not set | 647 | # CONFIG_SENSORS_PCA9539 is not set |