diff options
Diffstat (limited to 'arch/m68k/configs/q40_defconfig')
-rw-r--r-- | arch/m68k/configs/q40_defconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 35355c1bc714..64b71664a303 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_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 |
@@ -53,7 +54,6 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
53 | CONFIG_NET_IPGRE=m | 54 | CONFIG_NET_IPGRE=m |
54 | CONFIG_NET_IPVTI=m | 55 | CONFIG_NET_IPVTI=m |
55 | CONFIG_NET_FOU_IP_TUNNELS=y | 56 | CONFIG_NET_FOU_IP_TUNNELS=y |
56 | CONFIG_GENEVE_CORE=m | ||
57 | CONFIG_INET_AH=m | 57 | CONFIG_INET_AH=m |
58 | CONFIG_INET_ESP=m | 58 | CONFIG_INET_ESP=m |
59 | CONFIG_INET_IPCOMP=m | 59 | CONFIG_INET_IPCOMP=m |
@@ -63,10 +63,12 @@ CONFIG_INET_XFRM_MODE_BEET=m | |||
63 | # CONFIG_INET_LRO is not set | 63 | # CONFIG_INET_LRO is not set |
64 | CONFIG_INET_DIAG=m | 64 | CONFIG_INET_DIAG=m |
65 | CONFIG_INET_UDP_DIAG=m | 65 | CONFIG_INET_UDP_DIAG=m |
66 | CONFIG_IPV6=m | ||
66 | CONFIG_IPV6_ROUTER_PREF=y | 67 | CONFIG_IPV6_ROUTER_PREF=y |
67 | CONFIG_INET6_AH=m | 68 | CONFIG_INET6_AH=m |
68 | CONFIG_INET6_ESP=m | 69 | CONFIG_INET6_ESP=m |
69 | CONFIG_INET6_IPCOMP=m | 70 | CONFIG_INET6_IPCOMP=m |
71 | CONFIG_IPV6_ILA=m | ||
70 | CONFIG_IPV6_VTI=m | 72 | CONFIG_IPV6_VTI=m |
71 | CONFIG_IPV6_GRE=m | 73 | CONFIG_IPV6_GRE=m |
72 | CONFIG_NETFILTER=y | 74 | CONFIG_NETFILTER=y |
@@ -175,6 +177,7 @@ CONFIG_IP_SET_HASH_NETIFACE=m | |||
175 | CONFIG_IP_SET_LIST_SET=m | 177 | CONFIG_IP_SET_LIST_SET=m |
176 | CONFIG_NF_CONNTRACK_IPV4=m | 178 | CONFIG_NF_CONNTRACK_IPV4=m |
177 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 179 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
180 | CONFIG_NFT_DUP_IPV4=m | ||
178 | CONFIG_NF_TABLES_ARP=m | 181 | CONFIG_NF_TABLES_ARP=m |
179 | CONFIG_NF_LOG_ARP=m | 182 | CONFIG_NF_LOG_ARP=m |
180 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 183 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -202,6 +205,7 @@ CONFIG_IP_NF_ARPFILTER=m | |||
202 | CONFIG_IP_NF_ARP_MANGLE=m | 205 | CONFIG_IP_NF_ARP_MANGLE=m |
203 | CONFIG_NF_CONNTRACK_IPV6=m | 206 | CONFIG_NF_CONNTRACK_IPV6=m |
204 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 207 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
208 | CONFIG_NFT_DUP_IPV6=m | ||
205 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 209 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
206 | CONFIG_NFT_MASQ_IPV6=m | 210 | CONFIG_NFT_MASQ_IPV6=m |
207 | CONFIG_NFT_REDIR_IPV6=m | 211 | CONFIG_NFT_REDIR_IPV6=m |
@@ -267,6 +271,7 @@ CONFIG_NETLINK_DIAG=m | |||
267 | CONFIG_MPLS=y | 271 | CONFIG_MPLS=y |
268 | CONFIG_NET_MPLS_GSO=m | 272 | CONFIG_NET_MPLS_GSO=m |
269 | CONFIG_MPLS_ROUTING=m | 273 | CONFIG_MPLS_ROUTING=m |
274 | CONFIG_MPLS_IPTUNNEL=m | ||
270 | # CONFIG_WIRELESS is not set | 275 | # CONFIG_WIRELESS is not set |
271 | # CONFIG_UEVENT_HELPER is not set | 276 | # CONFIG_UEVENT_HELPER is not set |
272 | CONFIG_DEVTMPFS=y | 277 | CONFIG_DEVTMPFS=y |
@@ -354,6 +359,7 @@ CONFIG_NE2000=y | |||
354 | # CONFIG_NET_VENDOR_SEEQ is not set | 359 | # CONFIG_NET_VENDOR_SEEQ is not set |
355 | # CONFIG_NET_VENDOR_SMSC is not set | 360 | # CONFIG_NET_VENDOR_SMSC is not set |
356 | # CONFIG_NET_VENDOR_STMICRO is not set | 361 | # CONFIG_NET_VENDOR_STMICRO is not set |
362 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
357 | # CONFIG_NET_VENDOR_VIA is not set | 363 | # CONFIG_NET_VENDOR_VIA is not set |
358 | # CONFIG_NET_VENDOR_WIZNET is not set | 364 | # CONFIG_NET_VENDOR_WIZNET is not set |
359 | CONFIG_PLIP=m | 365 | CONFIG_PLIP=m |
@@ -510,6 +516,7 @@ CONFIG_TEST_USER_COPY=m | |||
510 | CONFIG_TEST_BPF=m | 516 | CONFIG_TEST_BPF=m |
511 | CONFIG_TEST_FIRMWARE=m | 517 | CONFIG_TEST_FIRMWARE=m |
512 | CONFIG_TEST_UDELAY=m | 518 | CONFIG_TEST_UDELAY=m |
519 | CONFIG_TEST_STATIC_KEYS=m | ||
513 | CONFIG_EARLY_PRINTK=y | 520 | CONFIG_EARLY_PRINTK=y |
514 | CONFIG_ENCRYPTED_KEYS=m | 521 | CONFIG_ENCRYPTED_KEYS=m |
515 | CONFIG_CRYPTO_RSA=m | 522 | CONFIG_CRYPTO_RSA=m |