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/mvme16x_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/mvme16x_defconfig')
-rw-r--r-- | arch/m68k/configs/mvme16x_defconfig | 40 |
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 | |||
32 | CONFIG_MVME16x=y | 32 | CONFIG_MVME16x=y |
33 | # CONFIG_COMPACTION is not set | 33 | # CONFIG_COMPACTION is not set |
34 | CONFIG_CLEANCACHE=y | 34 | CONFIG_CLEANCACHE=y |
35 | CONFIG_ZPOOL=m | ||
35 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 36 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
36 | CONFIG_BINFMT_AOUT=m | 37 | CONFIG_BINFMT_AOUT=m |
37 | CONFIG_BINFMT_MISC=m | 38 | CONFIG_BINFMT_MISC=m |
@@ -51,6 +52,8 @@ CONFIG_NET_IPIP=m | |||
51 | CONFIG_NET_IPGRE_DEMUX=m | 52 | CONFIG_NET_IPGRE_DEMUX=m |
52 | CONFIG_NET_IPGRE=m | 53 | CONFIG_NET_IPGRE=m |
53 | CONFIG_NET_IPVTI=m | 54 | CONFIG_NET_IPVTI=m |
55 | CONFIG_NET_FOU_IP_TUNNELS=y | ||
56 | CONFIG_GENEVE=m | ||
54 | CONFIG_INET_AH=m | 57 | CONFIG_INET_AH=m |
55 | CONFIG_INET_ESP=m | 58 | CONFIG_INET_ESP=m |
56 | CONFIG_INET_IPCOMP=m | 59 | CONFIG_INET_IPCOMP=m |
@@ -92,6 +95,8 @@ CONFIG_NFT_HASH=m | |||
92 | CONFIG_NFT_COUNTER=m | 95 | CONFIG_NFT_COUNTER=m |
93 | CONFIG_NFT_LOG=m | 96 | CONFIG_NFT_LOG=m |
94 | CONFIG_NFT_LIMIT=m | 97 | CONFIG_NFT_LIMIT=m |
98 | CONFIG_NFT_MASQ=m | ||
99 | CONFIG_NFT_REDIR=m | ||
95 | CONFIG_NFT_NAT=m | 100 | CONFIG_NFT_NAT=m |
96 | CONFIG_NFT_QUEUE=m | 101 | CONFIG_NFT_QUEUE=m |
97 | CONFIG_NFT_REJECT=m | 102 | CONFIG_NFT_REJECT=m |
@@ -159,6 +164,7 @@ CONFIG_IP_SET_HASH_IPMARK=m | |||
159 | CONFIG_IP_SET_HASH_IPPORT=m | 164 | CONFIG_IP_SET_HASH_IPPORT=m |
160 | CONFIG_IP_SET_HASH_IPPORTIP=m | 165 | CONFIG_IP_SET_HASH_IPPORTIP=m |
161 | CONFIG_IP_SET_HASH_IPPORTNET=m | 166 | CONFIG_IP_SET_HASH_IPPORTNET=m |
167 | CONFIG_IP_SET_HASH_MAC=m | ||
162 | CONFIG_IP_SET_HASH_NETPORTNET=m | 168 | CONFIG_IP_SET_HASH_NETPORTNET=m |
163 | CONFIG_IP_SET_HASH_NET=m | 169 | CONFIG_IP_SET_HASH_NET=m |
164 | CONFIG_IP_SET_HASH_NETNET=m | 170 | CONFIG_IP_SET_HASH_NETNET=m |
@@ -166,9 +172,12 @@ CONFIG_IP_SET_HASH_NETPORT=m | |||
166 | CONFIG_IP_SET_HASH_NETIFACE=m | 172 | CONFIG_IP_SET_HASH_NETIFACE=m |
167 | CONFIG_IP_SET_LIST_SET=m | 173 | CONFIG_IP_SET_LIST_SET=m |
168 | CONFIG_NF_CONNTRACK_IPV4=m | 174 | CONFIG_NF_CONNTRACK_IPV4=m |
175 | CONFIG_NF_LOG_ARP=m | ||
169 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 176 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
170 | CONFIG_NFT_CHAIN_NAT_IPV4=m | ||
171 | CONFIG_NF_TABLES_ARP=m | 177 | CONFIG_NF_TABLES_ARP=m |
178 | CONFIG_NFT_CHAIN_NAT_IPV4=m | ||
179 | CONFIG_NFT_MASQ_IPV4=m | ||
180 | CONFIG_NFT_REDIR_IPV4=m | ||
172 | CONFIG_IP_NF_IPTABLES=m | 181 | CONFIG_IP_NF_IPTABLES=m |
173 | CONFIG_IP_NF_MATCH_AH=m | 182 | CONFIG_IP_NF_MATCH_AH=m |
174 | CONFIG_IP_NF_MATCH_ECN=m | 183 | CONFIG_IP_NF_MATCH_ECN=m |
@@ -177,8 +186,7 @@ CONFIG_IP_NF_MATCH_TTL=m | |||
177 | CONFIG_IP_NF_FILTER=m | 186 | CONFIG_IP_NF_FILTER=m |
178 | CONFIG_IP_NF_TARGET_REJECT=m | 187 | CONFIG_IP_NF_TARGET_REJECT=m |
179 | CONFIG_IP_NF_TARGET_SYNPROXY=m | 188 | CONFIG_IP_NF_TARGET_SYNPROXY=m |
180 | CONFIG_IP_NF_TARGET_ULOG=m | 189 | CONFIG_IP_NF_NAT=m |
181 | CONFIG_NF_NAT_IPV4=m | ||
182 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 190 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
183 | CONFIG_IP_NF_TARGET_NETMAP=m | 191 | CONFIG_IP_NF_TARGET_NETMAP=m |
184 | CONFIG_IP_NF_TARGET_REDIRECT=m | 192 | CONFIG_IP_NF_TARGET_REDIRECT=m |
@@ -193,6 +201,8 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
193 | CONFIG_NF_CONNTRACK_IPV6=m | 201 | CONFIG_NF_CONNTRACK_IPV6=m |
194 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 202 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
195 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 203 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
204 | CONFIG_NFT_MASQ_IPV6=m | ||
205 | CONFIG_NFT_REDIR_IPV6=m | ||
196 | CONFIG_IP6_NF_IPTABLES=m | 206 | CONFIG_IP6_NF_IPTABLES=m |
197 | CONFIG_IP6_NF_MATCH_AH=m | 207 | CONFIG_IP6_NF_MATCH_AH=m |
198 | CONFIG_IP6_NF_MATCH_EUI64=m | 208 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -209,10 +219,9 @@ CONFIG_IP6_NF_TARGET_REJECT=m | |||
209 | CONFIG_IP6_NF_TARGET_SYNPROXY=m | 219 | CONFIG_IP6_NF_TARGET_SYNPROXY=m |
210 | CONFIG_IP6_NF_MANGLE=m | 220 | CONFIG_IP6_NF_MANGLE=m |
211 | CONFIG_IP6_NF_RAW=m | 221 | CONFIG_IP6_NF_RAW=m |
212 | CONFIG_NF_NAT_IPV6=m | 222 | CONFIG_IP6_NF_NAT=m |
213 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 223 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
214 | CONFIG_IP6_NF_TARGET_NPT=m | 224 | CONFIG_IP6_NF_TARGET_NPT=m |
215 | CONFIG_NF_TABLES_BRIDGE=m | ||
216 | CONFIG_IP_DCCP=m | 225 | CONFIG_IP_DCCP=m |
217 | # CONFIG_IP_DCCP_CCID3 is not set | 226 | # CONFIG_IP_DCCP_CCID3 is not set |
218 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y | 227 | CONFIG_SCTP_COOKIE_HMAC_SHA1=y |
@@ -220,6 +229,7 @@ CONFIG_RDS=m | |||
220 | CONFIG_RDS_TCP=m | 229 | CONFIG_RDS_TCP=m |
221 | CONFIG_L2TP=m | 230 | CONFIG_L2TP=m |
222 | CONFIG_ATALK=m | 231 | CONFIG_ATALK=m |
232 | CONFIG_6LOWPAN=m | ||
223 | CONFIG_DNS_RESOLVER=y | 233 | CONFIG_DNS_RESOLVER=y |
224 | CONFIG_BATMAN_ADV=m | 234 | CONFIG_BATMAN_ADV=m |
225 | CONFIG_BATMAN_ADV_DAT=y | 235 | CONFIG_BATMAN_ADV_DAT=y |
@@ -228,9 +238,9 @@ CONFIG_BATMAN_ADV_MCAST=y | |||
228 | CONFIG_NETLINK_DIAG=m | 238 | CONFIG_NETLINK_DIAG=m |
229 | CONFIG_NET_MPLS_GSO=m | 239 | CONFIG_NET_MPLS_GSO=m |
230 | # CONFIG_WIRELESS is not set | 240 | # CONFIG_WIRELESS is not set |
241 | # CONFIG_UEVENT_HELPER is not set | ||
231 | CONFIG_DEVTMPFS=y | 242 | CONFIG_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 | ||
234 | CONFIG_CONNECTOR=m | 244 | CONFIG_CONNECTOR=m |
235 | CONFIG_BLK_DEV_LOOP=y | 245 | CONFIG_BLK_DEV_LOOP=y |
236 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 246 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
@@ -280,6 +290,9 @@ CONFIG_NET_TEAM_MODE_ROUNDROBIN=m | |||
280 | CONFIG_NET_TEAM_MODE_RANDOM=m | 290 | CONFIG_NET_TEAM_MODE_RANDOM=m |
281 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m | 291 | CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m |
282 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m | 292 | CONFIG_NET_TEAM_MODE_LOADBALANCE=m |
293 | CONFIG_MACVLAN=m | ||
294 | CONFIG_MACVTAP=m | ||
295 | CONFIG_IPVLAN=m | ||
283 | CONFIG_VXLAN=m | 296 | CONFIG_VXLAN=m |
284 | CONFIG_NETCONSOLE=m | 297 | CONFIG_NETCONSOLE=m |
285 | CONFIG_NETCONSOLE_DYNAMIC=y | 298 | CONFIG_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 | |||
326 | CONFIG_HIDRAW=y | 341 | CONFIG_HIDRAW=y |
327 | CONFIG_UHID=m | 342 | CONFIG_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 |
330 | CONFIG_RTC_CLASS=y | 346 | CONFIG_RTC_CLASS=y |
331 | CONFIG_RTC_DRV_GENERIC=m | 347 | CONFIG_RTC_DRV_GENERIC=m |
@@ -343,6 +359,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y | |||
343 | CONFIG_AUTOFS4_FS=m | 359 | CONFIG_AUTOFS4_FS=m |
344 | CONFIG_FUSE_FS=m | 360 | CONFIG_FUSE_FS=m |
345 | CONFIG_CUSE=m | 361 | CONFIG_CUSE=m |
362 | CONFIG_OVERLAY_FS=m | ||
346 | CONFIG_ISO9660_FS=y | 363 | CONFIG_ISO9660_FS=y |
347 | CONFIG_JOLIET=y | 364 | CONFIG_JOLIET=y |
348 | CONFIG_ZISOFS=y | 365 | CONFIG_ZISOFS=y |
@@ -358,6 +375,7 @@ CONFIG_HFS_FS=m | |||
358 | CONFIG_HFSPLUS_FS=m | 375 | CONFIG_HFSPLUS_FS=m |
359 | CONFIG_CRAMFS=m | 376 | CONFIG_CRAMFS=m |
360 | CONFIG_SQUASHFS=m | 377 | CONFIG_SQUASHFS=m |
378 | CONFIG_SQUASHFS_LZ4=y | ||
361 | CONFIG_SQUASHFS_LZO=y | 379 | CONFIG_SQUASHFS_LZO=y |
362 | CONFIG_MINIX_FS=m | 380 | CONFIG_MINIX_FS=m |
363 | CONFIG_OMFS_FS=m | 381 | CONFIG_OMFS_FS=m |
@@ -432,6 +450,7 @@ CONFIG_ENCRYPTED_KEYS=m | |||
432 | CONFIG_CRYPTO_MANAGER=y | 450 | CONFIG_CRYPTO_MANAGER=y |
433 | CONFIG_CRYPTO_USER=m | 451 | CONFIG_CRYPTO_USER=m |
434 | CONFIG_CRYPTO_CRYPTD=m | 452 | CONFIG_CRYPTO_CRYPTD=m |
453 | CONFIG_CRYPTO_MCRYPTD=m | ||
435 | CONFIG_CRYPTO_TEST=m | 454 | CONFIG_CRYPTO_TEST=m |
436 | CONFIG_CRYPTO_CCM=m | 455 | CONFIG_CRYPTO_CCM=m |
437 | CONFIG_CRYPTO_GCM=m | 456 | CONFIG_CRYPTO_GCM=m |
@@ -466,13 +485,10 @@ CONFIG_CRYPTO_LZO=m | |||
466 | CONFIG_CRYPTO_LZ4=m | 485 | CONFIG_CRYPTO_LZ4=m |
467 | CONFIG_CRYPTO_LZ4HC=m | 486 | CONFIG_CRYPTO_LZ4HC=m |
468 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 487 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
488 | CONFIG_CRYPTO_DRBG_MENU=m | ||
489 | CONFIG_CRYPTO_DRBG_HASH=y | ||
490 | CONFIG_CRYPTO_DRBG_CTR=y | ||
469 | CONFIG_CRYPTO_USER_API_HASH=m | 491 | CONFIG_CRYPTO_USER_API_HASH=m |
470 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 492 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
471 | # CONFIG_CRYPTO_HW is not set | 493 | # CONFIG_CRYPTO_HW is not set |
472 | CONFIG_XZ_DEC_X86=y | ||
473 | CONFIG_XZ_DEC_POWERPC=y | ||
474 | CONFIG_XZ_DEC_IA64=y | ||
475 | CONFIG_XZ_DEC_ARM=y | ||
476 | CONFIG_XZ_DEC_ARMTHUMB=y | ||
477 | CONFIG_XZ_DEC_SPARC=y | ||
478 | CONFIG_XZ_DEC_TEST=m | 494 | CONFIG_XZ_DEC_TEST=m |