diff options
Diffstat (limited to 'arch/m68k/configs/multi_defconfig')
-rw-r--r-- | arch/m68k/configs/multi_defconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 8afca3753db1..83c80d2030ec 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
@@ -10,6 +10,7 @@ CONFIG_LOG_BUF_SHIFT=16 | |||
10 | # CONFIG_PID_NS is not set | 10 | # CONFIG_PID_NS is not set |
11 | # CONFIG_NET_NS is not set | 11 | # CONFIG_NET_NS is not set |
12 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
13 | CONFIG_USERFAULTFD=y | ||
13 | CONFIG_SLAB=y | 14 | CONFIG_SLAB=y |
14 | CONFIG_MODULES=y | 15 | CONFIG_MODULES=y |
15 | CONFIG_MODULE_UNLOAD=y | 16 | CONFIG_MODULE_UNLOAD=y |
@@ -64,7 +65,6 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
64 | CONFIG_NET_IPGRE=m | 65 | CONFIG_NET_IPGRE=m |
65 | CONFIG_NET_IPVTI=m | 66 | CONFIG_NET_IPVTI=m |
66 | CONFIG_NET_FOU_IP_TUNNELS=y | 67 | CONFIG_NET_FOU_IP_TUNNELS=y |
67 | CONFIG_GENEVE_CORE=m | ||
68 | CONFIG_INET_AH=m | 68 | CONFIG_INET_AH=m |
69 | CONFIG_INET_ESP=m | 69 | CONFIG_INET_ESP=m |
70 | CONFIG_INET_IPCOMP=m | 70 | CONFIG_INET_IPCOMP=m |
@@ -74,10 +74,12 @@ CONFIG_INET_XFRM_MODE_BEET=m | |||
74 | # CONFIG_INET_LRO is not set | 74 | # CONFIG_INET_LRO is not set |
75 | CONFIG_INET_DIAG=m | 75 | CONFIG_INET_DIAG=m |
76 | CONFIG_INET_UDP_DIAG=m | 76 | CONFIG_INET_UDP_DIAG=m |
77 | CONFIG_IPV6=m | ||
77 | CONFIG_IPV6_ROUTER_PREF=y | 78 | CONFIG_IPV6_ROUTER_PREF=y |
78 | CONFIG_INET6_AH=m | 79 | CONFIG_INET6_AH=m |
79 | CONFIG_INET6_ESP=m | 80 | CONFIG_INET6_ESP=m |
80 | CONFIG_INET6_IPCOMP=m | 81 | CONFIG_INET6_IPCOMP=m |
82 | CONFIG_IPV6_ILA=m | ||
81 | CONFIG_IPV6_VTI=m | 83 | CONFIG_IPV6_VTI=m |
82 | CONFIG_IPV6_GRE=m | 84 | CONFIG_IPV6_GRE=m |
83 | CONFIG_NETFILTER=y | 85 | CONFIG_NETFILTER=y |
@@ -186,6 +188,7 @@ CONFIG_IP_SET_HASH_NETIFACE=m | |||
186 | CONFIG_IP_SET_LIST_SET=m | 188 | CONFIG_IP_SET_LIST_SET=m |
187 | CONFIG_NF_CONNTRACK_IPV4=m | 189 | CONFIG_NF_CONNTRACK_IPV4=m |
188 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 190 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
191 | CONFIG_NFT_DUP_IPV4=m | ||
189 | CONFIG_NF_TABLES_ARP=m | 192 | CONFIG_NF_TABLES_ARP=m |
190 | CONFIG_NF_LOG_ARP=m | 193 | CONFIG_NF_LOG_ARP=m |
191 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 194 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -213,6 +216,7 @@ CONFIG_IP_NF_ARPFILTER=m | |||
213 | CONFIG_IP_NF_ARP_MANGLE=m | 216 | CONFIG_IP_NF_ARP_MANGLE=m |
214 | CONFIG_NF_CONNTRACK_IPV6=m | 217 | CONFIG_NF_CONNTRACK_IPV6=m |
215 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 218 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
219 | CONFIG_NFT_DUP_IPV6=m | ||
216 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 220 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
217 | CONFIG_NFT_MASQ_IPV6=m | 221 | CONFIG_NFT_MASQ_IPV6=m |
218 | CONFIG_NFT_REDIR_IPV6=m | 222 | CONFIG_NFT_REDIR_IPV6=m |
@@ -281,6 +285,7 @@ CONFIG_NETLINK_DIAG=m | |||
281 | CONFIG_MPLS=y | 285 | CONFIG_MPLS=y |
282 | CONFIG_NET_MPLS_GSO=m | 286 | CONFIG_NET_MPLS_GSO=m |
283 | CONFIG_MPLS_ROUTING=m | 287 | CONFIG_MPLS_ROUTING=m |
288 | CONFIG_MPLS_IPTUNNEL=m | ||
284 | # CONFIG_WIRELESS is not set | 289 | # CONFIG_WIRELESS is not set |
285 | # CONFIG_UEVENT_HELPER is not set | 290 | # CONFIG_UEVENT_HELPER is not set |
286 | CONFIG_DEVTMPFS=y | 291 | CONFIG_DEVTMPFS=y |
@@ -410,6 +415,7 @@ CONFIG_ZORRO8390=y | |||
410 | # CONFIG_NET_VENDOR_SEEQ is not set | 415 | # CONFIG_NET_VENDOR_SEEQ is not set |
411 | CONFIG_SMC91X=y | 416 | CONFIG_SMC91X=y |
412 | # CONFIG_NET_VENDOR_STMICRO is not set | 417 | # CONFIG_NET_VENDOR_STMICRO is not set |
418 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
413 | # CONFIG_NET_VENDOR_VIA is not set | 419 | # CONFIG_NET_VENDOR_VIA is not set |
414 | # CONFIG_NET_VENDOR_WIZNET is not set | 420 | # CONFIG_NET_VENDOR_WIZNET is not set |
415 | CONFIG_PLIP=m | 421 | CONFIG_PLIP=m |
@@ -599,6 +605,7 @@ CONFIG_TEST_USER_COPY=m | |||
599 | CONFIG_TEST_BPF=m | 605 | CONFIG_TEST_BPF=m |
600 | CONFIG_TEST_FIRMWARE=m | 606 | CONFIG_TEST_FIRMWARE=m |
601 | CONFIG_TEST_UDELAY=m | 607 | CONFIG_TEST_UDELAY=m |
608 | CONFIG_TEST_STATIC_KEYS=m | ||
602 | CONFIG_EARLY_PRINTK=y | 609 | CONFIG_EARLY_PRINTK=y |
603 | CONFIG_ENCRYPTED_KEYS=m | 610 | CONFIG_ENCRYPTED_KEYS=m |
604 | CONFIG_CRYPTO_RSA=m | 611 | CONFIG_CRYPTO_RSA=m |