summaryrefslogtreecommitdiffstats
path: root/arch/mips/configs/maltasmvp_defconfig
diff options
context:
space:
mode:
authorSteven J. Hill <Steven.Hill@imgtec.com>2013-10-04 23:23:28 +0200
committerRalf Baechle <ralf@linux-mips.org>2014-01-22 20:19:01 +0100
commitc080faa502041c94f754e9878618a4632d6eede6 (patch)
tree3e3bfc991f0eec052bda99282d7673decc287a03 /arch/mips/configs/maltasmvp_defconfig
parentMIPS: kernel: cpu-probe: Add support for probing interAptiv cores (diff)
downloadlinux-c080faa502041c94f754e9878618a4632d6eede6.tar.xz
linux-c080faa502041c94f754e9878618a4632d6eede6.zip
MIPS: Clean up MIPS MT and CMP configuration options.
This patch accomplishes the following: * Clean up wording on all MIPS MT configuration menu items. * Simplify and neaten up options selected by MIPS_MT_SMP. * Make MIPS_MT_SMTC support as deprecated. * Make MIPS_CMP support to depend on MIPS_MT_SMP also. * Remove redundant options selected by MIPS_CMP. Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com> Signed-off-by: John Crispin <blogic@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/6019/
Diffstat (limited to 'arch/mips/configs/maltasmvp_defconfig')
-rw-r--r--arch/mips/configs/maltasmvp_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/configs/maltasmvp_defconfig b/arch/mips/configs/maltasmvp_defconfig
index 8a666021b870..d75931850392 100644
--- a/arch/mips/configs/maltasmvp_defconfig
+++ b/arch/mips/configs/maltasmvp_defconfig
@@ -4,7 +4,7 @@ CONFIG_CPU_MIPS32_R2=y
CONFIG_MIPS_MT_SMP=y
CONFIG_SCHED_SMT=y
CONFIG_MIPS_CMP=y
-CONFIG_NR_CPUS=8
+CONFIG_NR_CPUS=2
CONFIG_HZ_100=y
CONFIG_LOCALVERSION="cmp"
CONFIG_SYSVIPC=y
@@ -58,7 +58,6 @@ CONFIG_ATALK=m
CONFIG_DEV_APPLETALK=m
CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_CBQ=m
CONFIG_NET_SCH_HTB=m