diff options
Diffstat (limited to 'arch/m68k/configs/amiga_defconfig')
-rw-r--r-- | arch/m68k/configs/amiga_defconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 0b6b40d37b95..5b4ec541ba7c 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_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 |
@@ -57,7 +58,6 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
57 | CONFIG_NET_IPGRE=m | 58 | CONFIG_NET_IPGRE=m |
58 | CONFIG_NET_IPVTI=m | 59 | CONFIG_NET_IPVTI=m |
59 | CONFIG_NET_FOU_IP_TUNNELS=y | 60 | CONFIG_NET_FOU_IP_TUNNELS=y |
60 | CONFIG_GENEVE_CORE=m | ||
61 | CONFIG_INET_AH=m | 61 | CONFIG_INET_AH=m |
62 | CONFIG_INET_ESP=m | 62 | CONFIG_INET_ESP=m |
63 | CONFIG_INET_IPCOMP=m | 63 | CONFIG_INET_IPCOMP=m |
@@ -67,10 +67,12 @@ CONFIG_INET_XFRM_MODE_BEET=m | |||
67 | # CONFIG_INET_LRO is not set | 67 | # CONFIG_INET_LRO is not set |
68 | CONFIG_INET_DIAG=m | 68 | CONFIG_INET_DIAG=m |
69 | CONFIG_INET_UDP_DIAG=m | 69 | CONFIG_INET_UDP_DIAG=m |
70 | CONFIG_IPV6=m | ||
70 | CONFIG_IPV6_ROUTER_PREF=y | 71 | CONFIG_IPV6_ROUTER_PREF=y |
71 | CONFIG_INET6_AH=m | 72 | CONFIG_INET6_AH=m |
72 | CONFIG_INET6_ESP=m | 73 | CONFIG_INET6_ESP=m |
73 | CONFIG_INET6_IPCOMP=m | 74 | CONFIG_INET6_IPCOMP=m |
75 | CONFIG_IPV6_ILA=m | ||
74 | CONFIG_IPV6_VTI=m | 76 | CONFIG_IPV6_VTI=m |
75 | CONFIG_IPV6_GRE=m | 77 | CONFIG_IPV6_GRE=m |
76 | CONFIG_NETFILTER=y | 78 | CONFIG_NETFILTER=y |
@@ -179,6 +181,7 @@ CONFIG_IP_SET_HASH_NETIFACE=m | |||
179 | CONFIG_IP_SET_LIST_SET=m | 181 | CONFIG_IP_SET_LIST_SET=m |
180 | CONFIG_NF_CONNTRACK_IPV4=m | 182 | CONFIG_NF_CONNTRACK_IPV4=m |
181 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 183 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
184 | CONFIG_NFT_DUP_IPV4=m | ||
182 | CONFIG_NF_TABLES_ARP=m | 185 | CONFIG_NF_TABLES_ARP=m |
183 | CONFIG_NF_LOG_ARP=m | 186 | CONFIG_NF_LOG_ARP=m |
184 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 187 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -206,6 +209,7 @@ CONFIG_IP_NF_ARPFILTER=m | |||
206 | CONFIG_IP_NF_ARP_MANGLE=m | 209 | CONFIG_IP_NF_ARP_MANGLE=m |
207 | CONFIG_NF_CONNTRACK_IPV6=m | 210 | CONFIG_NF_CONNTRACK_IPV6=m |
208 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 211 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
212 | CONFIG_NFT_DUP_IPV6=m | ||
209 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 213 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
210 | CONFIG_NFT_MASQ_IPV6=m | 214 | CONFIG_NFT_MASQ_IPV6=m |
211 | CONFIG_NFT_REDIR_IPV6=m | 215 | CONFIG_NFT_REDIR_IPV6=m |
@@ -271,6 +275,7 @@ CONFIG_NETLINK_DIAG=m | |||
271 | CONFIG_MPLS=y | 275 | CONFIG_MPLS=y |
272 | CONFIG_NET_MPLS_GSO=m | 276 | CONFIG_NET_MPLS_GSO=m |
273 | CONFIG_MPLS_ROUTING=m | 277 | CONFIG_MPLS_ROUTING=m |
278 | CONFIG_MPLS_IPTUNNEL=m | ||
274 | # CONFIG_WIRELESS is not set | 279 | # CONFIG_WIRELESS is not set |
275 | # CONFIG_UEVENT_HELPER is not set | 280 | # CONFIG_UEVENT_HELPER is not set |
276 | CONFIG_DEVTMPFS=y | 281 | CONFIG_DEVTMPFS=y |
@@ -370,6 +375,7 @@ CONFIG_ZORRO8390=y | |||
370 | # CONFIG_NET_VENDOR_SEEQ is not set | 375 | # CONFIG_NET_VENDOR_SEEQ is not set |
371 | # CONFIG_NET_VENDOR_SMSC is not set | 376 | # CONFIG_NET_VENDOR_SMSC is not set |
372 | # CONFIG_NET_VENDOR_STMICRO is not set | 377 | # CONFIG_NET_VENDOR_STMICRO is not set |
378 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
373 | # CONFIG_NET_VENDOR_VIA is not set | 379 | # CONFIG_NET_VENDOR_VIA is not set |
374 | # CONFIG_NET_VENDOR_WIZNET is not set | 380 | # CONFIG_NET_VENDOR_WIZNET is not set |
375 | CONFIG_PPP=m | 381 | CONFIG_PPP=m |
@@ -537,6 +543,7 @@ CONFIG_TEST_USER_COPY=m | |||
537 | CONFIG_TEST_BPF=m | 543 | CONFIG_TEST_BPF=m |
538 | CONFIG_TEST_FIRMWARE=m | 544 | CONFIG_TEST_FIRMWARE=m |
539 | CONFIG_TEST_UDELAY=m | 545 | CONFIG_TEST_UDELAY=m |
546 | CONFIG_TEST_STATIC_KEYS=m | ||
540 | CONFIG_EARLY_PRINTK=y | 547 | CONFIG_EARLY_PRINTK=y |
541 | CONFIG_ENCRYPTED_KEYS=m | 548 | CONFIG_ENCRYPTED_KEYS=m |
542 | CONFIG_CRYPTO_RSA=m | 549 | CONFIG_CRYPTO_RSA=m |