aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/configs/mvme16x_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/mvme16x_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/mvme16x_defconfig')
-rw-r--r--arch/m68k/configs/mvme16x_defconfig40
1 files changed, 28 insertions, 12 deletions
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 9326ea664a5b..2a57c9a1f2a6 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -32,6 +32,7 @@ CONFIG_VME=y
32CONFIG_MVME16x=y 32CONFIG_MVME16x=y
33# CONFIG_COMPACTION is not set 33# CONFIG_COMPACTION is not set
34CONFIG_CLEANCACHE=y 34CONFIG_CLEANCACHE=y
35CONFIG_ZPOOL=m
35# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 36# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
36CONFIG_BINFMT_AOUT=m 37CONFIG_BINFMT_AOUT=m
37CONFIG_BINFMT_MISC=m 38CONFIG_BINFMT_MISC=m
@@ -51,6 +52,8 @@ CONFIG_NET_IPIP=m
51CONFIG_NET_IPGRE_DEMUX=m 52CONFIG_NET_IPGRE_DEMUX=m
52CONFIG_NET_IPGRE=m 53CONFIG_NET_IPGRE=m
53CONFIG_NET_IPVTI=m 54CONFIG_NET_IPVTI=m
55CONFIG_NET_FOU_IP_TUNNELS=y
56CONFIG_GENEVE=m
54CONFIG_INET_AH=m 57CONFIG_INET_AH=m
55CONFIG_INET_ESP=m 58CONFIG_INET_ESP=m
56CONFIG_INET_IPCOMP=m 59CONFIG_INET_IPCOMP=m
@@ -92,6 +95,8 @@ CONFIG_NFT_HASH=m
92CONFIG_NFT_COUNTER=m 95CONFIG_NFT_COUNTER=m
93CONFIG_NFT_LOG=m 96CONFIG_NFT_LOG=m
94CONFIG_NFT_LIMIT=m 97CONFIG_NFT_LIMIT=m
98CONFIG_NFT_MASQ=m
99CONFIG_NFT_REDIR=m
95CONFIG_NFT_NAT=m 100CONFIG_NFT_NAT=m
96CONFIG_NFT_QUEUE=m 101CONFIG_NFT_QUEUE=m
97CONFIG_NFT_REJECT=m 102CONFIG_NFT_REJECT=m
@@ -159,6 +164,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
159CONFIG_IP_SET_HASH_IPPORT=m 164CONFIG_IP_SET_HASH_IPPORT=m
160CONFIG_IP_SET_HASH_IPPORTIP=m 165CONFIG_IP_SET_HASH_IPPORTIP=m
161CONFIG_IP_SET_HASH_IPPORTNET=m 166CONFIG_IP_SET_HASH_IPPORTNET=m
167CONFIG_IP_SET_HASH_MAC=m
162CONFIG_IP_SET_HASH_NETPORTNET=m 168CONFIG_IP_SET_HASH_NETPORTNET=m
163CONFIG_IP_SET_HASH_NET=m 169CONFIG_IP_SET_HASH_NET=m
164CONFIG_IP_SET_HASH_NETNET=m 170CONFIG_IP_SET_HASH_NETNET=m
@@ -166,9 +172,12 @@ CONFIG_IP_SET_HASH_NETPORT=m
166CONFIG_IP_SET_HASH_NETIFACE=m 172CONFIG_IP_SET_HASH_NETIFACE=m
167CONFIG_IP_SET_LIST_SET=m 173CONFIG_IP_SET_LIST_SET=m
168CONFIG_NF_CONNTRACK_IPV4=m 174CONFIG_NF_CONNTRACK_IPV4=m
175CONFIG_NF_LOG_ARP=m
169CONFIG_NFT_CHAIN_ROUTE_IPV4=m 176CONFIG_NFT_CHAIN_ROUTE_IPV4=m
170CONFIG_NFT_CHAIN_NAT_IPV4=m
171CONFIG_NF_TABLES_ARP=m 177CONFIG_NF_TABLES_ARP=m
178CONFIG_NFT_CHAIN_NAT_IPV4=m
179CONFIG_NFT_MASQ_IPV4=m
180CONFIG_NFT_REDIR_IPV4=m
172CONFIG_IP_NF_IPTABLES=m 181CONFIG_IP_NF_IPTABLES=m
173CONFIG_IP_NF_MATCH_AH=m 182CONFIG_IP_NF_MATCH_AH=m
174CONFIG_IP_NF_MATCH_ECN=m 183CONFIG_IP_NF_MATCH_ECN=m
@@ -177,8 +186,7 @@ CONFIG_IP_NF_MATCH_TTL=m
177CONFIG_IP_NF_FILTER=m 186CONFIG_IP_NF_FILTER=m
178CONFIG_IP_NF_TARGET_REJECT=m 187CONFIG_IP_NF_TARGET_REJECT=m
179CONFIG_IP_NF_TARGET_SYNPROXY=m 188CONFIG_IP_NF_TARGET_SYNPROXY=m
180CONFIG_IP_NF_TARGET_ULOG=m 189CONFIG_IP_NF_NAT=m
181CONFIG_NF_NAT_IPV4=m
182CONFIG_IP_NF_TARGET_MASQUERADE=m 190CONFIG_IP_NF_TARGET_MASQUERADE=m
183CONFIG_IP_NF_TARGET_NETMAP=m 191CONFIG_IP_NF_TARGET_NETMAP=m
184CONFIG_IP_NF_TARGET_REDIRECT=m 192CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -193,6 +201,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
193CONFIG_NF_CONNTRACK_IPV6=m 201CONFIG_NF_CONNTRACK_IPV6=m
194CONFIG_NFT_CHAIN_ROUTE_IPV6=m 202CONFIG_NFT_CHAIN_ROUTE_IPV6=m
195CONFIG_NFT_CHAIN_NAT_IPV6=m 203CONFIG_NFT_CHAIN_NAT_IPV6=m
204CONFIG_NFT_MASQ_IPV6=m
205CONFIG_NFT_REDIR_IPV6=m
196CONFIG_IP6_NF_IPTABLES=m 206CONFIG_IP6_NF_IPTABLES=m
197CONFIG_IP6_NF_MATCH_AH=m 207CONFIG_IP6_NF_MATCH_AH=m
198CONFIG_IP6_NF_MATCH_EUI64=m 208CONFIG_IP6_NF_MATCH_EUI64=m
@@ -209,10 +219,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m
209CONFIG_IP6_NF_TARGET_SYNPROXY=m 219CONFIG_IP6_NF_TARGET_SYNPROXY=m
210CONFIG_IP6_NF_MANGLE=m 220CONFIG_IP6_NF_MANGLE=m
211CONFIG_IP6_NF_RAW=m 221CONFIG_IP6_NF_RAW=m
212CONFIG_NF_NAT_IPV6=m 222CONFIG_IP6_NF_NAT=m
213CONFIG_IP6_NF_TARGET_MASQUERADE=m 223CONFIG_IP6_NF_TARGET_MASQUERADE=m
214CONFIG_IP6_NF_TARGET_NPT=m 224CONFIG_IP6_NF_TARGET_NPT=m
215CONFIG_NF_TABLES_BRIDGE=m
216CONFIG_IP_DCCP=m 225CONFIG_IP_DCCP=m
217# CONFIG_IP_DCCP_CCID3 is not set 226# CONFIG_IP_DCCP_CCID3 is not set
218CONFIG_SCTP_COOKIE_HMAC_SHA1=y 227CONFIG_SCTP_COOKIE_HMAC_SHA1=y
@@ -220,6 +229,7 @@ CONFIG_RDS=m
220CONFIG_RDS_TCP=m 229CONFIG_RDS_TCP=m
221CONFIG_L2TP=m 230CONFIG_L2TP=m
222CONFIG_ATALK=m 231CONFIG_ATALK=m
232CONFIG_6LOWPAN=m
223CONFIG_DNS_RESOLVER=y 233CONFIG_DNS_RESOLVER=y
224CONFIG_BATMAN_ADV=m 234CONFIG_BATMAN_ADV=m
225CONFIG_BATMAN_ADV_DAT=y 235CONFIG_BATMAN_ADV_DAT=y
@@ -228,9 +238,9 @@ CONFIG_BATMAN_ADV_MCAST=y
228CONFIG_NETLINK_DIAG=m 238CONFIG_NETLINK_DIAG=m
229CONFIG_NET_MPLS_GSO=m 239CONFIG_NET_MPLS_GSO=m
230# CONFIG_WIRELESS is not set 240# CONFIG_WIRELESS is not set
241# CONFIG_UEVENT_HELPER is not set
231CONFIG_DEVTMPFS=y 242CONFIG_DEVTMPFS=y
232# CONFIG_FIRMWARE_IN_KERNEL is not set 243# CONFIG_FIRMWARE_IN_KERNEL is not set
233# CONFIG_FW_LOADER_USER_HELPER is not set
234CONFIG_CONNECTOR=m 244CONFIG_CONNECTOR=m
235CONFIG_BLK_DEV_LOOP=y 245CONFIG_BLK_DEV_LOOP=y
236CONFIG_BLK_DEV_CRYPTOLOOP=m 246CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -280,6 +290,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
280CONFIG_NET_TEAM_MODE_RANDOM=m 290CONFIG_NET_TEAM_MODE_RANDOM=m
281CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m 291CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
282CONFIG_NET_TEAM_MODE_LOADBALANCE=m 292CONFIG_NET_TEAM_MODE_LOADBALANCE=m
293CONFIG_MACVLAN=m
294CONFIG_MACVTAP=m
295CONFIG_IPVLAN=m
283CONFIG_VXLAN=m 296CONFIG_VXLAN=m
284CONFIG_NETCONSOLE=m 297CONFIG_NETCONSOLE=m
285CONFIG_NETCONSOLE_DYNAMIC=y 298CONFIG_NETCONSOLE_DYNAMIC=y
@@ -290,6 +303,8 @@ CONFIG_MVME16x_NET=y
290# CONFIG_NET_VENDOR_MARVELL is not set 303# CONFIG_NET_VENDOR_MARVELL is not set
291# CONFIG_NET_VENDOR_MICREL is not set 304# CONFIG_NET_VENDOR_MICREL is not set
292# CONFIG_NET_VENDOR_NATSEMI is not set 305# CONFIG_NET_VENDOR_NATSEMI is not set
306# CONFIG_NET_VENDOR_QUALCOMM is not set
307# CONFIG_NET_VENDOR_ROCKER is not set
293# CONFIG_NET_VENDOR_SAMSUNG is not set 308# CONFIG_NET_VENDOR_SAMSUNG is not set
294# CONFIG_NET_VENDOR_SEEQ is not set 309# CONFIG_NET_VENDOR_SEEQ is not set
295# CONFIG_NET_VENDOR_STMICRO is not set 310# CONFIG_NET_VENDOR_STMICRO is not set
@@ -326,6 +341,7 @@ CONFIG_HID=m
326CONFIG_HIDRAW=y 341CONFIG_HIDRAW=y
327CONFIG_UHID=m 342CONFIG_UHID=m
328# CONFIG_HID_GENERIC is not set 343# CONFIG_HID_GENERIC is not set
344# CONFIG_HID_PLANTRONICS is not set
329# CONFIG_USB_SUPPORT is not set 345# CONFIG_USB_SUPPORT is not set
330CONFIG_RTC_CLASS=y 346CONFIG_RTC_CLASS=y
331CONFIG_RTC_DRV_GENERIC=m 347CONFIG_RTC_DRV_GENERIC=m
@@ -343,6 +359,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
343CONFIG_AUTOFS4_FS=m 359CONFIG_AUTOFS4_FS=m
344CONFIG_FUSE_FS=m 360CONFIG_FUSE_FS=m
345CONFIG_CUSE=m 361CONFIG_CUSE=m
362CONFIG_OVERLAY_FS=m
346CONFIG_ISO9660_FS=y 363CONFIG_ISO9660_FS=y
347CONFIG_JOLIET=y 364CONFIG_JOLIET=y
348CONFIG_ZISOFS=y 365CONFIG_ZISOFS=y
@@ -358,6 +375,7 @@ CONFIG_HFS_FS=m
358CONFIG_HFSPLUS_FS=m 375CONFIG_HFSPLUS_FS=m
359CONFIG_CRAMFS=m 376CONFIG_CRAMFS=m
360CONFIG_SQUASHFS=m 377CONFIG_SQUASHFS=m
378CONFIG_SQUASHFS_LZ4=y
361CONFIG_SQUASHFS_LZO=y 379CONFIG_SQUASHFS_LZO=y
362CONFIG_MINIX_FS=m 380CONFIG_MINIX_FS=m
363CONFIG_OMFS_FS=m 381CONFIG_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