aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/configs/sun3x_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/sun3x_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/sun3x_defconfig')
-rw-r--r--arch/m68k/configs/sun3x_defconfig40
1 files changed, 28 insertions, 12 deletions
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 5128a8c3f4e3..69b19b904ec5 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -29,6 +29,7 @@ CONFIG_BOOTINFO_PROC=y
29CONFIG_SUN3X=y 29CONFIG_SUN3X=y
30# CONFIG_COMPACTION is not set 30# CONFIG_COMPACTION is not set
31CONFIG_CLEANCACHE=y 31CONFIG_CLEANCACHE=y
32CONFIG_ZPOOL=m
32# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 33# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
33CONFIG_BINFMT_AOUT=m 34CONFIG_BINFMT_AOUT=m
34CONFIG_BINFMT_MISC=m 35CONFIG_BINFMT_MISC=m
@@ -48,6 +49,8 @@ CONFIG_NET_IPIP=m
48CONFIG_NET_IPGRE_DEMUX=m 49CONFIG_NET_IPGRE_DEMUX=m
49CONFIG_NET_IPGRE=m 50CONFIG_NET_IPGRE=m
50CONFIG_NET_IPVTI=m 51CONFIG_NET_IPVTI=m
52CONFIG_NET_FOU_IP_TUNNELS=y
53CONFIG_GENEVE=m
51CONFIG_INET_AH=m 54CONFIG_INET_AH=m
52CONFIG_INET_ESP=m 55CONFIG_INET_ESP=m
53CONFIG_INET_IPCOMP=m 56CONFIG_INET_IPCOMP=m
@@ -89,6 +92,8 @@ CONFIG_NFT_HASH=m
89CONFIG_NFT_COUNTER=m 92CONFIG_NFT_COUNTER=m
90CONFIG_NFT_LOG=m 93CONFIG_NFT_LOG=m
91CONFIG_NFT_LIMIT=m 94CONFIG_NFT_LIMIT=m
95CONFIG_NFT_MASQ=m
96CONFIG_NFT_REDIR=m
92CONFIG_NFT_NAT=m 97CONFIG_NFT_NAT=m
93CONFIG_NFT_QUEUE=m 98CONFIG_NFT_QUEUE=m
94CONFIG_NFT_REJECT=m 99CONFIG_NFT_REJECT=m
@@ -156,6 +161,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
156CONFIG_IP_SET_HASH_IPPORT=m 161CONFIG_IP_SET_HASH_IPPORT=m
157CONFIG_IP_SET_HASH_IPPORTIP=m 162CONFIG_IP_SET_HASH_IPPORTIP=m
158CONFIG_IP_SET_HASH_IPPORTNET=m 163CONFIG_IP_SET_HASH_IPPORTNET=m
164CONFIG_IP_SET_HASH_MAC=m
159CONFIG_IP_SET_HASH_NETPORTNET=m 165CONFIG_IP_SET_HASH_NETPORTNET=m
160CONFIG_IP_SET_HASH_NET=m 166CONFIG_IP_SET_HASH_NET=m
161CONFIG_IP_SET_HASH_NETNET=m 167CONFIG_IP_SET_HASH_NETNET=m
@@ -163,9 +169,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
163CONFIG_IP_SET_HASH_NETIFACE=m 169CONFIG_IP_SET_HASH_NETIFACE=m
164CONFIG_IP_SET_LIST_SET=m 170CONFIG_IP_SET_LIST_SET=m
165CONFIG_NF_CONNTRACK_IPV4=m 171CONFIG_NF_CONNTRACK_IPV4=m
172CONFIG_NF_LOG_ARP=m
166CONFIG_NFT_CHAIN_ROUTE_IPV4=m 173CONFIG_NFT_CHAIN_ROUTE_IPV4=m
167CONFIG_NFT_CHAIN_NAT_IPV4=m
168CONFIG_NF_TABLES_ARP=m 174CONFIG_NF_TABLES_ARP=m
175CONFIG_NFT_CHAIN_NAT_IPV4=m
176CONFIG_NFT_MASQ_IPV4=m
177CONFIG_NFT_REDIR_IPV4=m
169CONFIG_IP_NF_IPTABLES=m 178CONFIG_IP_NF_IPTABLES=m
170CONFIG_IP_NF_MATCH_AH=m 179CONFIG_IP_NF_MATCH_AH=m
171CONFIG_IP_NF_MATCH_ECN=m 180CONFIG_IP_NF_MATCH_ECN=m
@@ -174,8 +183,7 @@ CONFIG_IP_NF_MATCH_TTL=m
174CONFIG_IP_NF_FILTER=m 183CONFIG_IP_NF_FILTER=m
175CONFIG_IP_NF_TARGET_REJECT=m 184CONFIG_IP_NF_TARGET_REJECT=m
176CONFIG_IP_NF_TARGET_SYNPROXY=m 185CONFIG_IP_NF_TARGET_SYNPROXY=m
177CONFIG_IP_NF_TARGET_ULOG=m 186CONFIG_IP_NF_NAT=m
178CONFIG_NF_NAT_IPV4=m
179CONFIG_IP_NF_TARGET_MASQUERADE=m 187CONFIG_IP_NF_TARGET_MASQUERADE=m
180CONFIG_IP_NF_TARGET_NETMAP=m 188CONFIG_IP_NF_TARGET_NETMAP=m
181CONFIG_IP_NF_TARGET_REDIRECT=m 189CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -190,6 +198,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
190CONFIG_NF_CONNTRACK_IPV6=m 198CONFIG_NF_CONNTRACK_IPV6=m
191CONFIG_NFT_CHAIN_ROUTE_IPV6=m 199CONFIG_NFT_CHAIN_ROUTE_IPV6=m
192CONFIG_NFT_CHAIN_NAT_IPV6=m 200CONFIG_NFT_CHAIN_NAT_IPV6=m
201CONFIG_NFT_MASQ_IPV6=m
202CONFIG_NFT_REDIR_IPV6=m
193CONFIG_IP6_NF_IPTABLES=m 203CONFIG_IP6_NF_IPTABLES=m
194CONFIG_IP6_NF_MATCH_AH=m 204CONFIG_IP6_NF_MATCH_AH=m
195CONFIG_IP6_NF_MATCH_EUI64=m 205CONFIG_IP6_NF_MATCH_EUI64=m
@@ -206,10 +216,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m
206CONFIG_IP6_NF_TARGET_SYNPROXY=m 216CONFIG_IP6_NF_TARGET_SYNPROXY=m
207CONFIG_IP6_NF_MANGLE=m 217CONFIG_IP6_NF_MANGLE=m
208CONFIG_IP6_NF_RAW=m 218CONFIG_IP6_NF_RAW=m
209CONFIG_NF_NAT_IPV6=m 219CONFIG_IP6_NF_NAT=m
210CONFIG_IP6_NF_TARGET_MASQUERADE=m 220CONFIG_IP6_NF_TARGET_MASQUERADE=m
211CONFIG_IP6_NF_TARGET_NPT=m 221CONFIG_IP6_NF_TARGET_NPT=m
212CONFIG_NF_TABLES_BRIDGE=m
213CONFIG_IP_DCCP=m 222CONFIG_IP_DCCP=m
214# CONFIG_IP_DCCP_CCID3 is not set 223# CONFIG_IP_DCCP_CCID3 is not set
215CONFIG_SCTP_COOKIE_HMAC_SHA1=y 224CONFIG_SCTP_COOKIE_HMAC_SHA1=y
@@ -217,6 +226,7 @@ CONFIG_RDS=m
217CONFIG_RDS_TCP=m 226CONFIG_RDS_TCP=m
218CONFIG_L2TP=m 227CONFIG_L2TP=m
219CONFIG_ATALK=m 228CONFIG_ATALK=m
229CONFIG_6LOWPAN=m
220CONFIG_DNS_RESOLVER=y 230CONFIG_DNS_RESOLVER=y
221CONFIG_BATMAN_ADV=m 231CONFIG_BATMAN_ADV=m
222CONFIG_BATMAN_ADV_DAT=y 232CONFIG_BATMAN_ADV_DAT=y
@@ -225,9 +235,9 @@ CONFIG_BATMAN_ADV_MCAST=y
225CONFIG_NETLINK_DIAG=m 235CONFIG_NETLINK_DIAG=m
226CONFIG_NET_MPLS_GSO=m 236CONFIG_NET_MPLS_GSO=m
227# CONFIG_WIRELESS is not set 237# CONFIG_WIRELESS is not set
238# CONFIG_UEVENT_HELPER is not set
228CONFIG_DEVTMPFS=y 239CONFIG_DEVTMPFS=y
229# CONFIG_FIRMWARE_IN_KERNEL is not set 240# CONFIG_FIRMWARE_IN_KERNEL is not set
230# CONFIG_FW_LOADER_USER_HELPER is not set
231CONFIG_CONNECTOR=m 241CONFIG_CONNECTOR=m
232CONFIG_BLK_DEV_LOOP=y 242CONFIG_BLK_DEV_LOOP=y
233CONFIG_BLK_DEV_CRYPTOLOOP=m 243CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -277,6 +287,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
277CONFIG_NET_TEAM_MODE_RANDOM=m 287CONFIG_NET_TEAM_MODE_RANDOM=m
278CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 288CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
279CONFIG_NET_TEAM_MODE_LOADBALANCE=m 289CONFIG_NET_TEAM_MODE_LOADBALANCE=m
290CONFIG_MACVLAN=m
291CONFIG_MACVTAP=m
292CONFIG_IPVLAN=m
280CONFIG_VXLAN=m 293CONFIG_VXLAN=m
281CONFIG_NETCONSOLE=m 294CONFIG_NETCONSOLE=m
282CONFIG_NETCONSOLE_DYNAMIC=y 295CONFIG_NETCONSOLE_DYNAMIC=y
@@ -288,6 +301,8 @@ CONFIG_SUN3LANCE=y
288# CONFIG_NET_VENDOR_MARVELL is not set 301# CONFIG_NET_VENDOR_MARVELL is not set
289# CONFIG_NET_VENDOR_MICREL is not set 302# CONFIG_NET_VENDOR_MICREL is not set
290# CONFIG_NET_VENDOR_NATSEMI is not set 303# CONFIG_NET_VENDOR_NATSEMI is not set
304# CONFIG_NET_VENDOR_QUALCOMM is not set
305# CONFIG_NET_VENDOR_ROCKER is not set
291# CONFIG_NET_VENDOR_SAMSUNG is not set 306# CONFIG_NET_VENDOR_SAMSUNG is not set
292# CONFIG_NET_VENDOR_SEEQ is not set 307# CONFIG_NET_VENDOR_SEEQ is not set
293# CONFIG_NET_VENDOR_STMICRO is not set 308# CONFIG_NET_VENDOR_STMICRO is not set
@@ -327,6 +342,7 @@ CONFIG_HID=m
327CONFIG_HIDRAW=y 342CONFIG_HIDRAW=y
328CONFIG_UHID=m 343CONFIG_UHID=m
329# CONFIG_HID_GENERIC is not set 344# CONFIG_HID_GENERIC is not set
345# CONFIG_HID_PLANTRONICS is not set
330# CONFIG_USB_SUPPORT is not set 346# CONFIG_USB_SUPPORT is not set
331CONFIG_RTC_CLASS=y 347CONFIG_RTC_CLASS=y
332CONFIG_RTC_DRV_GENERIC=m 348CONFIG_RTC_DRV_GENERIC=m
@@ -344,6 +360,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
344CONFIG_AUTOFS4_FS=m 360CONFIG_AUTOFS4_FS=m
345CONFIG_FUSE_FS=m 361CONFIG_FUSE_FS=m
346CONFIG_CUSE=m 362CONFIG_CUSE=m
363CONFIG_OVERLAY_FS=m
347CONFIG_ISO9660_FS=y 364CONFIG_ISO9660_FS=y
348CONFIG_JOLIET=y 365CONFIG_JOLIET=y
349CONFIG_ZISOFS=y 366CONFIG_ZISOFS=y
@@ -359,6 +376,7 @@ CONFIG_HFS_FS=m
359CONFIG_HFSPLUS_FS=m 376CONFIG_HFSPLUS_FS=m
360CONFIG_CRAMFS=m 377CONFIG_CRAMFS=m
361CONFIG_SQUASHFS=m 378CONFIG_SQUASHFS=m
379CONFIG_SQUASHFS_LZ4=y
362CONFIG_SQUASHFS_LZO=y 380CONFIG_SQUASHFS_LZO=y
363CONFIG_MINIX_FS=m 381CONFIG_MINIX_FS=m
364CONFIG_OMFS_FS=m 382CONFIG_OMFS_FS=m
@@ -432,6 +450,7 @@ CONFIG_ENCRYPTED_KEYS=m
432CONFIG_CRYPTO_MANAGER=y 450CONFIG_CRYPTO_MANAGER=y
433CONFIG_CRYPTO_USER=m 451CONFIG_CRYPTO_USER=m
434CONFIG_CRYPTO_CRYPTD=m 452CONFIG_CRYPTO_CRYPTD=m
453CONFIG_CRYPTO_MCRYPTD=m
435CONFIG_CRYPTO_TEST=m 454CONFIG_CRYPTO_TEST=m
436CONFIG_CRYPTO_CCM=m 455CONFIG_CRYPTO_CCM=m
437CONFIG_CRYPTO_GCM=m 456CONFIG_CRYPTO_GCM=m
@@ -466,13 +485,10 @@ CONFIG_CRYPTO_LZO=m
466CONFIG_CRYPTO_LZ4=m 485CONFIG_CRYPTO_LZ4=m
467CONFIG_CRYPTO_LZ4HC=m 486CONFIG_CRYPTO_LZ4HC=m
468# CONFIG_CRYPTO_ANSI_CPRNG is not set 487# CONFIG_CRYPTO_ANSI_CPRNG is not set
488CONFIG_CRYPTO_DRBG_MENU=m
489CONFIG_CRYPTO_DRBG_HASH=y
490CONFIG_CRYPTO_DRBG_CTR=y
469CONFIG_CRYPTO_USER_API_HASH=m 491CONFIG_CRYPTO_USER_API_HASH=m
470CONFIG_CRYPTO_USER_API_SKCIPHER=m 492CONFIG_CRYPTO_USER_API_SKCIPHER=m
471# CONFIG_CRYPTO_HW is not set 493# CONFIG_CRYPTO_HW is not set
472CONFIG_XZ_DEC_X86=y
473CONFIG_XZ_DEC_POWERPC=y
474CONFIG_XZ_DEC_IA64=y
475CONFIG_XZ_DEC_ARM=y
476CONFIG_XZ_DEC_ARMTHUMB=y
477CONFIG_XZ_DEC_SPARC=y
478CONFIG_XZ_DEC_TEST=m 494CONFIG_XZ_DEC_TEST=m