diff options
Diffstat (limited to 'arch/m68k/configs/apollo_defconfig')
| -rw-r--r-- | arch/m68k/configs/apollo_defconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index eeb3a8991fc4..6e5198e2c124 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_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 |
| @@ -55,7 +56,6 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
| 55 | CONFIG_NET_IPGRE=m | 56 | CONFIG_NET_IPGRE=m |
| 56 | CONFIG_NET_IPVTI=m | 57 | CONFIG_NET_IPVTI=m |
| 57 | CONFIG_NET_FOU_IP_TUNNELS=y | 58 | CONFIG_NET_FOU_IP_TUNNELS=y |
| 58 | CONFIG_GENEVE_CORE=m | ||
| 59 | CONFIG_INET_AH=m | 59 | CONFIG_INET_AH=m |
| 60 | CONFIG_INET_ESP=m | 60 | CONFIG_INET_ESP=m |
| 61 | CONFIG_INET_IPCOMP=m | 61 | CONFIG_INET_IPCOMP=m |
| @@ -65,10 +65,12 @@ CONFIG_INET_XFRM_MODE_BEET=m | |||
| 65 | # CONFIG_INET_LRO is not set | 65 | # CONFIG_INET_LRO is not set |
| 66 | CONFIG_INET_DIAG=m | 66 | CONFIG_INET_DIAG=m |
| 67 | CONFIG_INET_UDP_DIAG=m | 67 | CONFIG_INET_UDP_DIAG=m |
| 68 | CONFIG_IPV6=m | ||
| 68 | CONFIG_IPV6_ROUTER_PREF=y | 69 | CONFIG_IPV6_ROUTER_PREF=y |
| 69 | CONFIG_INET6_AH=m | 70 | CONFIG_INET6_AH=m |
| 70 | CONFIG_INET6_ESP=m | 71 | CONFIG_INET6_ESP=m |
| 71 | CONFIG_INET6_IPCOMP=m | 72 | CONFIG_INET6_IPCOMP=m |
| 73 | CONFIG_IPV6_ILA=m | ||
| 72 | CONFIG_IPV6_VTI=m | 74 | CONFIG_IPV6_VTI=m |
| 73 | CONFIG_IPV6_GRE=m | 75 | CONFIG_IPV6_GRE=m |
| 74 | CONFIG_NETFILTER=y | 76 | CONFIG_NETFILTER=y |
| @@ -177,6 +179,7 @@ CONFIG_IP_SET_HASH_NETIFACE=m | |||
| 177 | CONFIG_IP_SET_LIST_SET=m | 179 | CONFIG_IP_SET_LIST_SET=m |
| 178 | CONFIG_NF_CONNTRACK_IPV4=m | 180 | CONFIG_NF_CONNTRACK_IPV4=m |
| 179 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 181 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
| 182 | CONFIG_NFT_DUP_IPV4=m | ||
| 180 | CONFIG_NF_TABLES_ARP=m | 183 | CONFIG_NF_TABLES_ARP=m |
| 181 | CONFIG_NF_LOG_ARP=m | 184 | CONFIG_NF_LOG_ARP=m |
| 182 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 185 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
| @@ -204,6 +207,7 @@ CONFIG_IP_NF_ARPFILTER=m | |||
| 204 | CONFIG_IP_NF_ARP_MANGLE=m | 207 | CONFIG_IP_NF_ARP_MANGLE=m |
| 205 | CONFIG_NF_CONNTRACK_IPV6=m | 208 | CONFIG_NF_CONNTRACK_IPV6=m |
| 206 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 209 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
| 210 | CONFIG_NFT_DUP_IPV6=m | ||
| 207 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 211 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
| 208 | CONFIG_NFT_MASQ_IPV6=m | 212 | CONFIG_NFT_MASQ_IPV6=m |
| 209 | CONFIG_NFT_REDIR_IPV6=m | 213 | CONFIG_NFT_REDIR_IPV6=m |
| @@ -269,6 +273,7 @@ CONFIG_NETLINK_DIAG=m | |||
| 269 | CONFIG_MPLS=y | 273 | CONFIG_MPLS=y |
| 270 | CONFIG_NET_MPLS_GSO=m | 274 | CONFIG_NET_MPLS_GSO=m |
| 271 | CONFIG_MPLS_ROUTING=m | 275 | CONFIG_MPLS_ROUTING=m |
| 276 | CONFIG_MPLS_IPTUNNEL=m | ||
| 272 | # CONFIG_WIRELESS is not set | 277 | # CONFIG_WIRELESS is not set |
| 273 | # CONFIG_UEVENT_HELPER is not set | 278 | # CONFIG_UEVENT_HELPER is not set |
| 274 | CONFIG_DEVTMPFS=y | 279 | CONFIG_DEVTMPFS=y |
| @@ -344,6 +349,7 @@ CONFIG_VETH=m | |||
| 344 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 349 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
| 345 | # CONFIG_NET_VENDOR_SEEQ is not set | 350 | # CONFIG_NET_VENDOR_SEEQ is not set |
| 346 | # CONFIG_NET_VENDOR_STMICRO is not set | 351 | # CONFIG_NET_VENDOR_STMICRO is not set |
| 352 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| 347 | # CONFIG_NET_VENDOR_VIA is not set | 353 | # CONFIG_NET_VENDOR_VIA is not set |
| 348 | # CONFIG_NET_VENDOR_WIZNET is not set | 354 | # CONFIG_NET_VENDOR_WIZNET is not set |
| 349 | CONFIG_PPP=m | 355 | CONFIG_PPP=m |
| @@ -495,6 +501,7 @@ CONFIG_TEST_USER_COPY=m | |||
| 495 | CONFIG_TEST_BPF=m | 501 | CONFIG_TEST_BPF=m |
| 496 | CONFIG_TEST_FIRMWARE=m | 502 | CONFIG_TEST_FIRMWARE=m |
| 497 | CONFIG_TEST_UDELAY=m | 503 | CONFIG_TEST_UDELAY=m |
| 504 | CONFIG_TEST_STATIC_KEYS=m | ||
| 498 | CONFIG_EARLY_PRINTK=y | 505 | CONFIG_EARLY_PRINTK=y |
| 499 | CONFIG_ENCRYPTED_KEYS=m | 506 | CONFIG_ENCRYPTED_KEYS=m |
| 500 | CONFIG_CRYPTO_RSA=m | 507 | CONFIG_CRYPTO_RSA=m |
