diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/configs/malta_defconfig | 7 | ||||
-rw-r--r-- | arch/mips/configs/malta_kvm_defconfig | 9 | ||||
-rw-r--r-- | arch/mips/configs/malta_kvm_guest_defconfig | 6 | ||||
-rw-r--r-- | arch/mips/configs/maltaaprp_defconfig | 2 | ||||
-rw-r--r-- | arch/mips/configs/maltasmtc_defconfig | 2 | ||||
-rw-r--r-- | arch/mips/configs/maltasmvp_defconfig | 1 | ||||
-rw-r--r-- | arch/mips/configs/maltaup_defconfig | 2 |
7 files changed, 3 insertions, 26 deletions
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index ce1d3eeeb737..bc494b2e0e45 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig | |||
@@ -2,6 +2,7 @@ CONFIG_MIPS_MALTA=y | |||
2 | CONFIG_CPU_LITTLE_ENDIAN=y | 2 | CONFIG_CPU_LITTLE_ENDIAN=y |
3 | CONFIG_CPU_MIPS32_R2=y | 3 | CONFIG_CPU_MIPS32_R2=y |
4 | CONFIG_MIPS_MT_SMP=y | 4 | CONFIG_MIPS_MT_SMP=y |
5 | CONFIG_NR_CPUS=2 | ||
5 | CONFIG_HZ_100=y | 6 | CONFIG_HZ_100=y |
6 | CONFIG_SYSVIPC=y | 7 | CONFIG_SYSVIPC=y |
7 | CONFIG_NO_HZ=y | 8 | CONFIG_NO_HZ=y |
@@ -42,7 +43,6 @@ CONFIG_INET_IPCOMP=m | |||
42 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 43 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
43 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 44 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
44 | CONFIG_TCP_MD5SIG=y | 45 | CONFIG_TCP_MD5SIG=y |
45 | CONFIG_IPV6_PRIVACY=y | ||
46 | CONFIG_IPV6_ROUTER_PREF=y | 46 | CONFIG_IPV6_ROUTER_PREF=y |
47 | CONFIG_IPV6_ROUTE_INFO=y | 47 | CONFIG_IPV6_ROUTE_INFO=y |
48 | CONFIG_IPV6_OPTIMISTIC_DAD=y | 48 | CONFIG_IPV6_OPTIMISTIC_DAD=y |
@@ -68,7 +68,6 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
68 | CONFIG_NF_CONNTRACK_SIP=m | 68 | CONFIG_NF_CONNTRACK_SIP=m |
69 | CONFIG_NF_CONNTRACK_TFTP=m | 69 | CONFIG_NF_CONNTRACK_TFTP=m |
70 | CONFIG_NF_CT_NETLINK=m | 70 | CONFIG_NF_CT_NETLINK=m |
71 | CONFIG_NETFILTER_TPROXY=m | ||
72 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 71 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
73 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 72 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
74 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 73 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
@@ -125,7 +124,6 @@ CONFIG_IP_VS_SH=m | |||
125 | CONFIG_IP_VS_SED=m | 124 | CONFIG_IP_VS_SED=m |
126 | CONFIG_IP_VS_NQ=m | 125 | CONFIG_IP_VS_NQ=m |
127 | CONFIG_NF_CONNTRACK_IPV4=m | 126 | CONFIG_NF_CONNTRACK_IPV4=m |
128 | CONFIG_IP_NF_QUEUE=m | ||
129 | CONFIG_IP_NF_IPTABLES=m | 127 | CONFIG_IP_NF_IPTABLES=m |
130 | CONFIG_IP_NF_MATCH_AH=m | 128 | CONFIG_IP_NF_MATCH_AH=m |
131 | CONFIG_IP_NF_MATCH_ECN=m | 129 | CONFIG_IP_NF_MATCH_ECN=m |
@@ -185,7 +183,6 @@ CONFIG_ATALK=m | |||
185 | CONFIG_DEV_APPLETALK=m | 183 | CONFIG_DEV_APPLETALK=m |
186 | CONFIG_IPDDP=m | 184 | CONFIG_IPDDP=m |
187 | CONFIG_IPDDP_ENCAP=y | 185 | CONFIG_IPDDP_ENCAP=y |
188 | CONFIG_IPDDP_DECAP=y | ||
189 | CONFIG_PHONET=m | 186 | CONFIG_PHONET=m |
190 | CONFIG_NET_SCHED=y | 187 | CONFIG_NET_SCHED=y |
191 | CONFIG_NET_SCH_CBQ=m | 188 | CONFIG_NET_SCH_CBQ=m |
@@ -228,7 +225,6 @@ CONFIG_RFKILL=m | |||
228 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 225 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
229 | CONFIG_CONNECTOR=m | 226 | CONFIG_CONNECTOR=m |
230 | CONFIG_MTD=y | 227 | CONFIG_MTD=y |
231 | CONFIG_MTD_CHAR=y | ||
232 | CONFIG_MTD_BLOCK=y | 228 | CONFIG_MTD_BLOCK=y |
233 | CONFIG_MTD_OOPS=m | 229 | CONFIG_MTD_OOPS=m |
234 | CONFIG_MTD_CFI=y | 230 | CONFIG_MTD_CFI=y |
@@ -328,7 +324,6 @@ CONFIG_LIBERTAS=m | |||
328 | # CONFIG_INPUT_KEYBOARD is not set | 324 | # CONFIG_INPUT_KEYBOARD is not set |
329 | # CONFIG_INPUT_MOUSE is not set | 325 | # CONFIG_INPUT_MOUSE is not set |
330 | # CONFIG_SERIO_I8042 is not set | 326 | # CONFIG_SERIO_I8042 is not set |
331 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
332 | CONFIG_SERIAL_8250=y | 327 | CONFIG_SERIAL_8250=y |
333 | CONFIG_SERIAL_8250_CONSOLE=y | 328 | CONFIG_SERIAL_8250_CONSOLE=y |
334 | # CONFIG_HWMON is not set | 329 | # CONFIG_HWMON is not set |
diff --git a/arch/mips/configs/malta_kvm_defconfig b/arch/mips/configs/malta_kvm_defconfig index 341bb47204d6..041e41b39478 100644 --- a/arch/mips/configs/malta_kvm_defconfig +++ b/arch/mips/configs/malta_kvm_defconfig | |||
@@ -3,6 +3,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y | |||
3 | CONFIG_CPU_MIPS32_R2=y | 3 | CONFIG_CPU_MIPS32_R2=y |
4 | CONFIG_PAGE_SIZE_16KB=y | 4 | CONFIG_PAGE_SIZE_16KB=y |
5 | CONFIG_MIPS_MT_SMP=y | 5 | CONFIG_MIPS_MT_SMP=y |
6 | CONFIG_NR_CPUS=2 | ||
6 | CONFIG_HZ_100=y | 7 | CONFIG_HZ_100=y |
7 | CONFIG_SYSVIPC=y | 8 | CONFIG_SYSVIPC=y |
8 | CONFIG_NO_HZ=y | 9 | CONFIG_NO_HZ=y |
@@ -44,7 +45,6 @@ CONFIG_INET_IPCOMP=m | |||
44 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 45 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
45 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 46 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
46 | CONFIG_TCP_MD5SIG=y | 47 | CONFIG_TCP_MD5SIG=y |
47 | CONFIG_IPV6_PRIVACY=y | ||
48 | CONFIG_IPV6_ROUTER_PREF=y | 48 | CONFIG_IPV6_ROUTER_PREF=y |
49 | CONFIG_IPV6_ROUTE_INFO=y | 49 | CONFIG_IPV6_ROUTE_INFO=y |
50 | CONFIG_IPV6_OPTIMISTIC_DAD=y | 50 | CONFIG_IPV6_OPTIMISTIC_DAD=y |
@@ -70,7 +70,6 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
70 | CONFIG_NF_CONNTRACK_SIP=m | 70 | CONFIG_NF_CONNTRACK_SIP=m |
71 | CONFIG_NF_CONNTRACK_TFTP=m | 71 | CONFIG_NF_CONNTRACK_TFTP=m |
72 | CONFIG_NF_CT_NETLINK=m | 72 | CONFIG_NF_CT_NETLINK=m |
73 | CONFIG_NETFILTER_TPROXY=m | ||
74 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 73 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
75 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 74 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
76 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 75 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
@@ -127,7 +126,6 @@ CONFIG_IP_VS_SH=m | |||
127 | CONFIG_IP_VS_SED=m | 126 | CONFIG_IP_VS_SED=m |
128 | CONFIG_IP_VS_NQ=m | 127 | CONFIG_IP_VS_NQ=m |
129 | CONFIG_NF_CONNTRACK_IPV4=m | 128 | CONFIG_NF_CONNTRACK_IPV4=m |
130 | CONFIG_IP_NF_QUEUE=m | ||
131 | CONFIG_IP_NF_IPTABLES=m | 129 | CONFIG_IP_NF_IPTABLES=m |
132 | CONFIG_IP_NF_MATCH_AH=m | 130 | CONFIG_IP_NF_MATCH_AH=m |
133 | CONFIG_IP_NF_MATCH_ECN=m | 131 | CONFIG_IP_NF_MATCH_ECN=m |
@@ -187,7 +185,6 @@ CONFIG_ATALK=m | |||
187 | CONFIG_DEV_APPLETALK=m | 185 | CONFIG_DEV_APPLETALK=m |
188 | CONFIG_IPDDP=m | 186 | CONFIG_IPDDP=m |
189 | CONFIG_IPDDP_ENCAP=y | 187 | CONFIG_IPDDP_ENCAP=y |
190 | CONFIG_IPDDP_DECAP=y | ||
191 | CONFIG_PHONET=m | 188 | CONFIG_PHONET=m |
192 | CONFIG_NET_SCHED=y | 189 | CONFIG_NET_SCHED=y |
193 | CONFIG_NET_SCH_CBQ=m | 190 | CONFIG_NET_SCH_CBQ=m |
@@ -230,7 +227,6 @@ CONFIG_RFKILL=m | |||
230 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 227 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
231 | CONFIG_CONNECTOR=m | 228 | CONFIG_CONNECTOR=m |
232 | CONFIG_MTD=y | 229 | CONFIG_MTD=y |
233 | CONFIG_MTD_CHAR=y | ||
234 | CONFIG_MTD_BLOCK=y | 230 | CONFIG_MTD_BLOCK=y |
235 | CONFIG_MTD_OOPS=m | 231 | CONFIG_MTD_OOPS=m |
236 | CONFIG_MTD_CFI=y | 232 | CONFIG_MTD_CFI=y |
@@ -300,6 +296,7 @@ CONFIG_IFB=m | |||
300 | CONFIG_MACVLAN=m | 296 | CONFIG_MACVLAN=m |
301 | CONFIG_TUN=m | 297 | CONFIG_TUN=m |
302 | CONFIG_VETH=m | 298 | CONFIG_VETH=m |
299 | CONFIG_VHOST_NET=m | ||
303 | CONFIG_PCNET32=y | 300 | CONFIG_PCNET32=y |
304 | CONFIG_CHELSIO_T3=m | 301 | CONFIG_CHELSIO_T3=m |
305 | CONFIG_AX88796=m | 302 | CONFIG_AX88796=m |
@@ -329,7 +326,6 @@ CONFIG_LIBERTAS=m | |||
329 | # CONFIG_INPUT_KEYBOARD is not set | 326 | # CONFIG_INPUT_KEYBOARD is not set |
330 | # CONFIG_INPUT_MOUSE is not set | 327 | # CONFIG_INPUT_MOUSE is not set |
331 | # CONFIG_SERIO_I8042 is not set | 328 | # CONFIG_SERIO_I8042 is not set |
332 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
333 | CONFIG_SERIAL_8250=y | 329 | CONFIG_SERIAL_8250=y |
334 | CONFIG_SERIAL_8250_CONSOLE=y | 330 | CONFIG_SERIAL_8250_CONSOLE=y |
335 | # CONFIG_HWMON is not set | 331 | # CONFIG_HWMON is not set |
@@ -453,4 +449,3 @@ CONFIG_VIRTUALIZATION=y | |||
453 | CONFIG_KVM=m | 449 | CONFIG_KVM=m |
454 | CONFIG_KVM_MIPS_DYN_TRANS=y | 450 | CONFIG_KVM_MIPS_DYN_TRANS=y |
455 | CONFIG_KVM_MIPS_DEBUG_COP0_COUNTERS=y | 451 | CONFIG_KVM_MIPS_DEBUG_COP0_COUNTERS=y |
456 | CONFIG_VHOST_NET=m | ||
diff --git a/arch/mips/configs/malta_kvm_guest_defconfig b/arch/mips/configs/malta_kvm_guest_defconfig index 2b8558b71080..bf186df3e589 100644 --- a/arch/mips/configs/malta_kvm_guest_defconfig +++ b/arch/mips/configs/malta_kvm_guest_defconfig | |||
@@ -44,7 +44,6 @@ CONFIG_INET_IPCOMP=m | |||
44 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 44 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
45 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 45 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
46 | CONFIG_TCP_MD5SIG=y | 46 | CONFIG_TCP_MD5SIG=y |
47 | CONFIG_IPV6_PRIVACY=y | ||
48 | CONFIG_IPV6_ROUTER_PREF=y | 47 | CONFIG_IPV6_ROUTER_PREF=y |
49 | CONFIG_IPV6_ROUTE_INFO=y | 48 | CONFIG_IPV6_ROUTE_INFO=y |
50 | CONFIG_IPV6_OPTIMISTIC_DAD=y | 49 | CONFIG_IPV6_OPTIMISTIC_DAD=y |
@@ -70,7 +69,6 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
70 | CONFIG_NF_CONNTRACK_SIP=m | 69 | CONFIG_NF_CONNTRACK_SIP=m |
71 | CONFIG_NF_CONNTRACK_TFTP=m | 70 | CONFIG_NF_CONNTRACK_TFTP=m |
72 | CONFIG_NF_CT_NETLINK=m | 71 | CONFIG_NF_CT_NETLINK=m |
73 | CONFIG_NETFILTER_TPROXY=m | ||
74 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 72 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
75 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | 73 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m |
76 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 74 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
@@ -127,7 +125,6 @@ CONFIG_IP_VS_SH=m | |||
127 | CONFIG_IP_VS_SED=m | 125 | CONFIG_IP_VS_SED=m |
128 | CONFIG_IP_VS_NQ=m | 126 | CONFIG_IP_VS_NQ=m |
129 | CONFIG_NF_CONNTRACK_IPV4=m | 127 | CONFIG_NF_CONNTRACK_IPV4=m |
130 | CONFIG_IP_NF_QUEUE=m | ||
131 | CONFIG_IP_NF_IPTABLES=m | 128 | CONFIG_IP_NF_IPTABLES=m |
132 | CONFIG_IP_NF_MATCH_AH=m | 129 | CONFIG_IP_NF_MATCH_AH=m |
133 | CONFIG_IP_NF_MATCH_ECN=m | 130 | CONFIG_IP_NF_MATCH_ECN=m |
@@ -187,7 +184,6 @@ CONFIG_ATALK=m | |||
187 | CONFIG_DEV_APPLETALK=m | 184 | CONFIG_DEV_APPLETALK=m |
188 | CONFIG_IPDDP=m | 185 | CONFIG_IPDDP=m |
189 | CONFIG_IPDDP_ENCAP=y | 186 | CONFIG_IPDDP_ENCAP=y |
190 | CONFIG_IPDDP_DECAP=y | ||
191 | CONFIG_PHONET=m | 187 | CONFIG_PHONET=m |
192 | CONFIG_NET_SCHED=y | 188 | CONFIG_NET_SCHED=y |
193 | CONFIG_NET_SCH_CBQ=m | 189 | CONFIG_NET_SCH_CBQ=m |
@@ -230,7 +226,6 @@ CONFIG_RFKILL=m | |||
230 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 226 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
231 | CONFIG_CONNECTOR=m | 227 | CONFIG_CONNECTOR=m |
232 | CONFIG_MTD=y | 228 | CONFIG_MTD=y |
233 | CONFIG_MTD_CHAR=y | ||
234 | CONFIG_MTD_BLOCK=y | 229 | CONFIG_MTD_BLOCK=y |
235 | CONFIG_MTD_OOPS=m | 230 | CONFIG_MTD_OOPS=m |
236 | CONFIG_MTD_CFI=y | 231 | CONFIG_MTD_CFI=y |
@@ -331,7 +326,6 @@ CONFIG_LIBERTAS=m | |||
331 | # CONFIG_INPUT_KEYBOARD is not set | 326 | # CONFIG_INPUT_KEYBOARD is not set |
332 | # CONFIG_INPUT_MOUSE is not set | 327 | # CONFIG_INPUT_MOUSE is not set |
333 | # CONFIG_SERIO_I8042 is not set | 328 | # CONFIG_SERIO_I8042 is not set |
334 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
335 | CONFIG_SERIAL_8250=y | 329 | CONFIG_SERIAL_8250=y |
336 | CONFIG_SERIAL_8250_CONSOLE=y | 330 | CONFIG_SERIAL_8250_CONSOLE=y |
337 | # CONFIG_HWMON is not set | 331 | # CONFIG_HWMON is not set |
diff --git a/arch/mips/configs/maltaaprp_defconfig b/arch/mips/configs/maltaaprp_defconfig index 93057a760dfa..90b17255e414 100644 --- a/arch/mips/configs/maltaaprp_defconfig +++ b/arch/mips/configs/maltaaprp_defconfig | |||
@@ -44,7 +44,6 @@ CONFIG_INET_AH=m | |||
44 | CONFIG_INET_ESP=m | 44 | CONFIG_INET_ESP=m |
45 | CONFIG_INET_IPCOMP=m | 45 | CONFIG_INET_IPCOMP=m |
46 | # CONFIG_INET_LRO is not set | 46 | # CONFIG_INET_LRO is not set |
47 | CONFIG_IPV6_PRIVACY=y | ||
48 | CONFIG_INET6_AH=m | 47 | CONFIG_INET6_AH=m |
49 | CONFIG_INET6_ESP=m | 48 | CONFIG_INET6_ESP=m |
50 | CONFIG_INET6_IPCOMP=m | 49 | CONFIG_INET6_IPCOMP=m |
@@ -55,7 +54,6 @@ CONFIG_ATALK=m | |||
55 | CONFIG_DEV_APPLETALK=m | 54 | CONFIG_DEV_APPLETALK=m |
56 | CONFIG_IPDDP=m | 55 | CONFIG_IPDDP=m |
57 | CONFIG_IPDDP_ENCAP=y | 56 | CONFIG_IPDDP_ENCAP=y |
58 | CONFIG_IPDDP_DECAP=y | ||
59 | CONFIG_NET_SCHED=y | 57 | CONFIG_NET_SCHED=y |
60 | CONFIG_NET_SCH_CBQ=m | 58 | CONFIG_NET_SCH_CBQ=m |
61 | CONFIG_NET_SCH_HTB=m | 59 | CONFIG_NET_SCH_HTB=m |
diff --git a/arch/mips/configs/maltasmtc_defconfig b/arch/mips/configs/maltasmtc_defconfig index 4e54b75d89be..991da9f84364 100644 --- a/arch/mips/configs/maltasmtc_defconfig +++ b/arch/mips/configs/maltasmtc_defconfig | |||
@@ -45,7 +45,6 @@ CONFIG_INET_AH=m | |||
45 | CONFIG_INET_ESP=m | 45 | CONFIG_INET_ESP=m |
46 | CONFIG_INET_IPCOMP=m | 46 | CONFIG_INET_IPCOMP=m |
47 | # CONFIG_INET_LRO is not set | 47 | # CONFIG_INET_LRO is not set |
48 | CONFIG_IPV6_PRIVACY=y | ||
49 | CONFIG_INET6_AH=m | 48 | CONFIG_INET6_AH=m |
50 | CONFIG_INET6_ESP=m | 49 | CONFIG_INET6_ESP=m |
51 | CONFIG_INET6_IPCOMP=m | 50 | CONFIG_INET6_IPCOMP=m |
@@ -56,7 +55,6 @@ CONFIG_ATALK=m | |||
56 | CONFIG_DEV_APPLETALK=m | 55 | CONFIG_DEV_APPLETALK=m |
57 | CONFIG_IPDDP=m | 56 | CONFIG_IPDDP=m |
58 | CONFIG_IPDDP_ENCAP=y | 57 | CONFIG_IPDDP_ENCAP=y |
59 | CONFIG_IPDDP_DECAP=y | ||
60 | CONFIG_NET_SCHED=y | 58 | CONFIG_NET_SCHED=y |
61 | CONFIG_NET_SCH_CBQ=m | 59 | CONFIG_NET_SCH_CBQ=m |
62 | CONFIG_NET_SCH_HTB=m | 60 | CONFIG_NET_SCH_HTB=m |
diff --git a/arch/mips/configs/maltasmvp_defconfig b/arch/mips/configs/maltasmvp_defconfig index d75931850392..1dafe793c42c 100644 --- a/arch/mips/configs/maltasmvp_defconfig +++ b/arch/mips/configs/maltasmvp_defconfig | |||
@@ -47,7 +47,6 @@ CONFIG_INET_AH=m | |||
47 | CONFIG_INET_ESP=m | 47 | CONFIG_INET_ESP=m |
48 | CONFIG_INET_IPCOMP=m | 48 | CONFIG_INET_IPCOMP=m |
49 | # CONFIG_INET_LRO is not set | 49 | # CONFIG_INET_LRO is not set |
50 | CONFIG_IPV6_PRIVACY=y | ||
51 | CONFIG_INET6_AH=m | 50 | CONFIG_INET6_AH=m |
52 | CONFIG_INET6_ESP=m | 51 | CONFIG_INET6_ESP=m |
53 | CONFIG_INET6_IPCOMP=m | 52 | CONFIG_INET6_IPCOMP=m |
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 | |||
43 | CONFIG_INET_ESP=m | 43 | CONFIG_INET_ESP=m |
44 | CONFIG_INET_IPCOMP=m | 44 | CONFIG_INET_IPCOMP=m |
45 | # CONFIG_INET_LRO is not set | 45 | # CONFIG_INET_LRO is not set |
46 | CONFIG_IPV6_PRIVACY=y | ||
47 | CONFIG_INET6_AH=m | 46 | CONFIG_INET6_AH=m |
48 | CONFIG_INET6_ESP=m | 47 | CONFIG_INET6_ESP=m |
49 | CONFIG_INET6_IPCOMP=m | 48 | CONFIG_INET6_IPCOMP=m |
@@ -54,7 +53,6 @@ CONFIG_ATALK=m | |||
54 | CONFIG_DEV_APPLETALK=m | 53 | CONFIG_DEV_APPLETALK=m |
55 | CONFIG_IPDDP=m | 54 | CONFIG_IPDDP=m |
56 | CONFIG_IPDDP_ENCAP=y | 55 | CONFIG_IPDDP_ENCAP=y |
57 | CONFIG_IPDDP_DECAP=y | ||
58 | CONFIG_NET_SCHED=y | 56 | CONFIG_NET_SCHED=y |
59 | CONFIG_NET_SCH_CBQ=m | 57 | CONFIG_NET_SCH_CBQ=m |
60 | CONFIG_NET_SCH_HTB=m | 58 | CONFIG_NET_SCH_HTB=m |