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