diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-06-17 04:06:56 -0400 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-01-31 09:00:59 -0500 |
| commit | d5264e2f5c9559340706882eec519728fddb772b (patch) | |
| tree | 6f9dc43bb322f9b554e996a84b0b7bedf0a178e8 /arch/m68k/configs/atari_defconfig | |
| parent | 87511d09206d5fdb178971aa83d0e08082e8c571 (diff) | |
m68k/defconfig: Refresh defconfigs for v3.16-rc1--v3.19-rc2
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/configs/atari_defconfig')
| -rw-r--r-- | arch/m68k/configs/atari_defconfig | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 391e185d73be..3f2b68db2700 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
| @@ -33,6 +33,7 @@ CONFIG_M68060=y | |||
| 33 | CONFIG_ATARI=y | 33 | CONFIG_ATARI=y |
| 34 | # CONFIG_COMPACTION is not set | 34 | # CONFIG_COMPACTION is not set |
| 35 | CONFIG_CLEANCACHE=y | 35 | CONFIG_CLEANCACHE=y |
| 36 | CONFIG_ZPOOL=m | ||
| 36 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 37 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| 37 | CONFIG_BINFMT_AOUT=m | 38 | CONFIG_BINFMT_AOUT=m |
| 38 | CONFIG_BINFMT_MISC=m | 39 | CONFIG_BINFMT_MISC=m |
| @@ -52,6 +53,8 @@ CONFIG_NET_IPIP=m | |||
| 52 | CONFIG_NET_IPGRE_DEMUX=m | 53 | 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 |
| 56 | CONFIG_NET_FOU_IP_TUNNELS=y | ||
| 57 | CONFIG_GENEVE=m | ||
| 55 | CONFIG_INET_AH=m | 58 | CONFIG_INET_AH=m |
| 56 | CONFIG_INET_ESP=m | 59 | CONFIG_INET_ESP=m |
| 57 | CONFIG_INET_IPCOMP=m | 60 | CONFIG_INET_IPCOMP=m |
| @@ -93,6 +96,8 @@ CONFIG_NFT_HASH=m | |||
| 93 | CONFIG_NFT_COUNTER=m | 96 | CONFIG_NFT_COUNTER=m |
| 94 | CONFIG_NFT_LOG=m | 97 | CONFIG_NFT_LOG=m |
| 95 | CONFIG_NFT_LIMIT=m | 98 | CONFIG_NFT_LIMIT=m |
| 99 | CONFIG_NFT_MASQ=m | ||
| 100 | CONFIG_NFT_REDIR=m | ||
| 96 | CONFIG_NFT_NAT=m | 101 | CONFIG_NFT_NAT=m |
| 97 | CONFIG_NFT_QUEUE=m | 102 | CONFIG_NFT_QUEUE=m |
| 98 | CONFIG_NFT_REJECT=m | 103 | CONFIG_NFT_REJECT=m |
| @@ -160,6 +165,7 @@ CONFIG_IP_SET_HASH_IPMARK=m | |||
| 160 | CONFIG_IP_SET_HASH_IPPORT=m | 165 | CONFIG_IP_SET_HASH_IPPORT=m |
| 161 | CONFIG_IP_SET_HASH_IPPORTIP=m | 166 | CONFIG_IP_SET_HASH_IPPORTIP=m |
| 162 | CONFIG_IP_SET_HASH_IPPORTNET=m | 167 | CONFIG_IP_SET_HASH_IPPORTNET=m |
| 168 | CONFIG_IP_SET_HASH_MAC=m | ||
| 163 | CONFIG_IP_SET_HASH_NETPORTNET=m | 169 | CONFIG_IP_SET_HASH_NETPORTNET=m |
| 164 | CONFIG_IP_SET_HASH_NET=m | 170 | CONFIG_IP_SET_HASH_NET=m |
| 165 | CONFIG_IP_SET_HASH_NETNET=m | 171 | CONFIG_IP_SET_HASH_NETNET=m |
| @@ -167,9 +173,12 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
| 167 | CONFIG_IP_SET_HASH_NETIFACE=m | 173 | CONFIG_IP_SET_HASH_NETIFACE=m |
| 168 | CONFIG_IP_SET_LIST_SET=m | 174 | CONFIG_IP_SET_LIST_SET=m |
| 169 | CONFIG_NF_CONNTRACK_IPV4=m | 175 | CONFIG_NF_CONNTRACK_IPV4=m |
| 176 | CONFIG_NF_LOG_ARP=m | ||
| 170 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 177 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
| 171 | CONFIG_NFT_CHAIN_NAT_IPV4=m | ||
| 172 | CONFIG_NF_TABLES_ARP=m | 178 | CONFIG_NF_TABLES_ARP=m |
| 179 | CONFIG_NFT_CHAIN_NAT_IPV4=m | ||
| 180 | CONFIG_NFT_MASQ_IPV4=m | ||
| 181 | CONFIG_NFT_REDIR_IPV4=m | ||
| 173 | CONFIG_IP_NF_IPTABLES=m | 182 | CONFIG_IP_NF_IPTABLES=m |
| 174 | CONFIG_IP_NF_MATCH_AH=m | 183 | CONFIG_IP_NF_MATCH_AH=m |
| 175 | CONFIG_IP_NF_MATCH_ECN=m | 184 | CONFIG_IP_NF_MATCH_ECN=m |
| @@ -178,8 +187,7 @@ CONFIG_IP_NF_MATCH_TTL=m | |||
| 178 | CONFIG_IP_NF_FILTER=m | 187 | CONFIG_IP_NF_FILTER=m |
| 179 | CONFIG_IP_NF_TARGET_REJECT=m | 188 | CONFIG_IP_NF_TARGET_REJECT=m |
| 180 | CONFIG_IP_NF_TARGET_SYNPROXY=m | 189 | CONFIG_IP_NF_TARGET_SYNPROXY=m |
| 181 | CONFIG_IP_NF_TARGET_ULOG=m | 190 | CONFIG_IP_NF_NAT=m |
| 182 | CONFIG_NF_NAT_IPV4=m | ||
| 183 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 191 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 184 | CONFIG_IP_NF_TARGET_NETMAP=m | 192 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 185 | CONFIG_IP_NF_TARGET_REDIRECT=m | 193 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| @@ -194,6 +202,8 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
| 194 | CONFIG_NF_CONNTRACK_IPV6=m | 202 | CONFIG_NF_CONNTRACK_IPV6=m |
| 195 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 203 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
| 196 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 204 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
| 205 | CONFIG_NFT_MASQ_IPV6=m | ||
| 206 | CONFIG_NFT_REDIR_IPV6=m | ||
| 197 | CONFIG_IP6_NF_IPTABLES=m | 207 | CONFIG_IP6_NF_IPTABLES=m |
| 198 | CONFIG_IP6_NF_MATCH_AH=m | 208 | CONFIG_IP6_NF_MATCH_AH=m |
| 199 | CONFIG_IP6_NF_MATCH_EUI64=m | 209 | CONFIG_IP6_NF_MATCH_EUI64=m |
| @@ -210,10 +220,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m | |||
| 210 | CONFIG_IP6_NF_TARGET_SYNPROXY=m | 220 | CONFIG_IP6_NF_TARGET_SYNPROXY=m |
| 211 | CONFIG_IP6_NF_MANGLE=m | 221 | CONFIG_IP6_NF_MANGLE=m |
| 212 | CONFIG_IP6_NF_RAW=m | 222 | CONFIG_IP6_NF_RAW=m |
| 213 | CONFIG_NF_NAT_IPV6=m | 223 | CONFIG_IP6_NF_NAT=m |
| 214 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 224 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
| 215 | CONFIG_IP6_NF_TARGET_NPT=m | 225 | CONFIG_IP6_NF_TARGET_NPT=m |
| 216 | CONFIG_NF_TABLES_BRIDGE=m | ||
| 217 | CONFIG_IP_DCCP=m | 226 | CONFIG_IP_DCCP=m |
| 218 | # CONFIG_IP_DCCP_CCID3 is not set | 227 | # CONFIG_IP_DCCP_CCID3 is not set |
| 219 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 228 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
| @@ -221,6 +230,7 @@ CONFIG_RDS=m | |||
| 221 | CONFIG_RDS_TCP=m | 230 | CONFIG_RDS_TCP=m |
| 222 | CONFIG_L2TP=m | 231 | CONFIG_L2TP=m |
| 223 | CONFIG_ATALK=m | 232 | CONFIG_ATALK=m |
| 233 | CONFIG_6LOWPAN=m | ||
| 224 | CONFIG_DNS_RESOLVER=y | 234 | CONFIG_DNS_RESOLVER=y |
| 225 | CONFIG_BATMAN_ADV=m | 235 | CONFIG_BATMAN_ADV=m |
| 226 | CONFIG_BATMAN_ADV_DAT=y | 236 | CONFIG_BATMAN_ADV_DAT=y |
| @@ -229,9 +239,9 @@ CONFIG_BATMAN_ADV_MCAST=y | |||
| 229 | CONFIG_NETLINK_DIAG=m | 239 | CONFIG_NETLINK_DIAG=m |
| 230 | CONFIG_NET_MPLS_GSO=m | 240 | CONFIG_NET_MPLS_GSO=m |
| 231 | # CONFIG_WIRELESS is not set | 241 | # CONFIG_WIRELESS is not set |
| 242 | # CONFIG_UEVENT_HELPER is not set | ||
| 232 | CONFIG_DEVTMPFS=y | 243 | CONFIG_DEVTMPFS=y |
| 233 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 244 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
| 234 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
| 235 | CONFIG_CONNECTOR=m | 245 | CONFIG_CONNECTOR=m |
| 236 | CONFIG_PARPORT=m | 246 | CONFIG_PARPORT=m |
| 237 | CONFIG_PARPORT_ATARI=m | 247 | CONFIG_PARPORT_ATARI=m |
| @@ -289,6 +299,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | |||
| 289 | CONFIG_NET_TEAM_MODE_RANDOM=m | 299 | CONFIG_NET_TEAM_MODE_RANDOM=m |
| 290 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | 300 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m |
| 291 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | 301 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m |
| 302 | CONFIG_MACVLAN=m | ||
| 303 | CONFIG_MACVTAP=m | ||
| 304 | CONFIG_IPVLAN=m | ||
| 292 | CONFIG_VXLAN=m | 305 | CONFIG_VXLAN=m |
| 293 | CONFIG_NETCONSOLE=m | 306 | CONFIG_NETCONSOLE=m |
| 294 | CONFIG_NETCONSOLE_DYNAMIC=y | 307 | CONFIG_NETCONSOLE_DYNAMIC=y |
| @@ -299,6 +312,8 @@ CONFIG_ATARILANCE=y | |||
| 299 | # CONFIG_NET_VENDOR_INTEL is not set | 312 | # CONFIG_NET_VENDOR_INTEL is not set |
| 300 | # CONFIG_NET_VENDOR_MARVELL is not set | 313 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 301 | # CONFIG_NET_VENDOR_MICREL is not set | 314 | # CONFIG_NET_VENDOR_MICREL is not set |
| 315 | # CONFIG_NET_VENDOR_QUALCOMM is not set | ||
| 316 | # CONFIG_NET_VENDOR_ROCKER is not set | ||
| 302 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 317 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
| 303 | # CONFIG_NET_VENDOR_SEEQ is not set | 318 | # CONFIG_NET_VENDOR_SEEQ is not set |
| 304 | # CONFIG_NET_VENDOR_STMICRO is not set | 319 | # CONFIG_NET_VENDOR_STMICRO is not set |
| @@ -345,6 +360,7 @@ CONFIG_DMASOUND_ATARI=m | |||
| 345 | CONFIG_HID=m | 360 | CONFIG_HID=m |
| 346 | CONFIG_HIDRAW=y | 361 | CONFIG_HIDRAW=y |
| 347 | CONFIG_UHID=m | 362 | CONFIG_UHID=m |
| 363 | # CONFIG_HID_PLANTRONICS is not set | ||
| 348 | CONFIG_RTC_CLASS=y | 364 | CONFIG_RTC_CLASS=y |
| 349 | CONFIG_RTC_DRV_GENERIC=m | 365 | CONFIG_RTC_DRV_GENERIC=m |
| 350 | # CONFIG_IOMMU_SUPPORT is not set | 366 | # CONFIG_IOMMU_SUPPORT is not set |
| @@ -367,6 +383,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y | |||
| 367 | CONFIG_AUTOFS4_FS=m | 383 | CONFIG_AUTOFS4_FS=m |
| 368 | CONFIG_FUSE_FS=m | 384 | CONFIG_FUSE_FS=m |
| 369 | CONFIG_CUSE=m | 385 | CONFIG_CUSE=m |
| 386 | CONFIG_OVERLAY_FS=m | ||
| 370 | CONFIG_ISO9660_FS=y | 387 | CONFIG_ISO9660_FS=y |
| 371 | CONFIG_JOLIET=y | 388 | CONFIG_JOLIET=y |
| 372 | CONFIG_ZISOFS=y | 389 | CONFIG_ZISOFS=y |
| @@ -382,6 +399,7 @@ CONFIG_HFS_FS=m | |||
| 382 | CONFIG_HFSPLUS_FS=m | 399 | CONFIG_HFSPLUS_FS=m |
| 383 | CONFIG_CRAMFS=m | 400 | CONFIG_CRAMFS=m |
| 384 | CONFIG_SQUASHFS=m | 401 | CONFIG_SQUASHFS=m |
| 402 | CONFIG_SQUASHFS_LZ4=y | ||
| 385 | CONFIG_SQUASHFS_LZO=y | 403 | CONFIG_SQUASHFS_LZO=y |
| 386 | CONFIG_MINIX_FS=m | 404 | CONFIG_MINIX_FS=m |
| 387 | CONFIG_OMFS_FS=m | 405 | CONFIG_OMFS_FS=m |
| @@ -455,6 +473,7 @@ CONFIG_ENCRYPTED_KEYS=m | |||
| 455 | CONFIG_CRYPTO_MANAGER=y | 473 | CONFIG_CRYPTO_MANAGER=y |
| 456 | CONFIG_CRYPTO_USER=m | 474 | CONFIG_CRYPTO_USER=m |
| 457 | CONFIG_CRYPTO_CRYPTD=m | 475 | CONFIG_CRYPTO_CRYPTD=m |
| 476 | CONFIG_CRYPTO_MCRYPTD=m | ||
| 458 | CONFIG_CRYPTO_TEST=m | 477 | CONFIG_CRYPTO_TEST=m |
| 459 | CONFIG_CRYPTO_CCM=m | 478 | CONFIG_CRYPTO_CCM=m |
| 460 | CONFIG_CRYPTO_GCM=m | 479 | CONFIG_CRYPTO_GCM=m |
| @@ -489,13 +508,10 @@ CONFIG_CRYPTO_LZO=m | |||
| 489 | CONFIG_CRYPTO_LZ4=m | 508 | CONFIG_CRYPTO_LZ4=m |
| 490 | CONFIG_CRYPTO_LZ4HC=m | 509 | CONFIG_CRYPTO_LZ4HC=m |
| 491 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 510 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 511 | CONFIG_CRYPTO_DRBG_MENU=m | ||
| 512 | CONFIG_CRYPTO_DRBG_HASH=y | ||
| 513 | CONFIG_CRYPTO_DRBG_CTR=y | ||
| 492 | CONFIG_CRYPTO_USER_API_HASH=m | 514 | CONFIG_CRYPTO_USER_API_HASH=m |
| 493 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 515 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
| 494 | # CONFIG_CRYPTO_HW is not set | 516 | # CONFIG_CRYPTO_HW is not set |
| 495 | CONFIG_XZ_DEC_X86=y | ||
| 496 | CONFIG_XZ_DEC_POWERPC=y | ||
| 497 | CONFIG_XZ_DEC_IA64=y | ||
| 498 | CONFIG_XZ_DEC_ARM=y | ||
| 499 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
| 500 | CONFIG_XZ_DEC_SPARC=y | ||
| 501 | CONFIG_XZ_DEC_TEST=m | 517 | CONFIG_XZ_DEC_TEST=m |
