summaryrefslogtreecommitdiffstats
path: root/arch/mips/configs/maltaup_defconfig
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2014-02-20 15:00:24 +0100
committerRalf Baechle <ralf@linux-mips.org>2014-03-26 23:09:21 +0100
commita86dc812881fab40175f4d3c3028acf8627a3804 (patch)
tree5d1c1c732ffdac911f274a7bbf60d5f3ca159f10 /arch/mips/configs/maltaup_defconfig
parentMIPS: Alchemy: pata_platform for DB1200 (diff)
downloadlinux-a86dc812881fab40175f4d3c3028acf8627a3804.tar.xz
linux-a86dc812881fab40175f4d3c3028acf8627a3804.zip
MIPS: Regenerate malta defconfigs
This patch simply regenerates the malta defconfigs such that they don't change after being used & saved as a defconfig again. ie. it is the result of running the following: for cfg in arch/mips/configs/malta*; do ARCH=mips make `basename ${cfg}` ARCH=mips make savedefconfig mv -v defconfig ${cfg} done Signed-off-by: Paul Burton <paul.burton@imgtec.com> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/6578/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/configs/maltaup_defconfig')
-rw-r--r--arch/mips/configs/maltaup_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/configs/maltaup_defconfig b/arch/mips/configs/maltaup_defconfig
index 9868fc9c1133..b8a97a2b6a36 100644
--- a/arch/mips/configs/maltaup_defconfig
+++ b/arch/mips/configs/maltaup_defconfig
@@ -43,7 +43,6 @@ CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
# CONFIG_INET_LRO is not set
-CONFIG_IPV6_PRIVACY=y
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m
@@ -54,7 +53,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