aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/configs/fulong_defconfig
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2009-01-30 17:50:57 -0500
committerH. Peter Anvin <hpa@linux.intel.com>2009-01-30 17:50:57 -0500
commit9b7ed8faa034fc2d350e2eff5c68680eb5c43a07 (patch)
tree5c94c34ad30e312604c1ce4f08ab6631b64a94f5 /arch/mips/configs/fulong_defconfig
parent6522869c34664dd5f05a0a327e93915b1281c90d (diff)
parentc43e0e46adf79c321ed3fbf0351e1005fb8a2413 (diff)
Merge branch 'core/percpu' into x86/paravirt
Diffstat (limited to 'arch/mips/configs/fulong_defconfig')
-rw-r--r--arch/mips/configs/fulong_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/configs/fulong_defconfig b/arch/mips/configs/fulong_defconfig
index b6698a232ae9..786a9bc9a696 100644
--- a/arch/mips/configs/fulong_defconfig
+++ b/arch/mips/configs/fulong_defconfig
@@ -1006,8 +1006,8 @@ CONFIG_I2C_VIAPRO=m
1006# Miscellaneous I2C Chip support 1006# Miscellaneous I2C Chip support
1007# 1007#
1008# CONFIG_DS1682 is not set 1008# CONFIG_DS1682 is not set
1009# CONFIG_AT24 is not set 1009# CONFIG_EEPROM_AT24 is not set
1010# CONFIG_SENSORS_EEPROM is not set 1010# CONFIG_EEPROM_LEGACY is not set
1011# CONFIG_SENSORS_PCF8574 is not set 1011# CONFIG_SENSORS_PCF8574 is not set
1012# CONFIG_PCF8575 is not set 1012# CONFIG_PCF8575 is not set
1013# CONFIG_SENSORS_PCA9539 is not set 1013# CONFIG_SENSORS_PCA9539 is not set