diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2016-01-24 16:39:04 -0500 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2016-02-01 04:35:38 -0500 |
| commit | daf670bc9d36ba8b03e010f4bf798bebe08659fe (patch) | |
| tree | 59338f6f4ff547e046fc26b466828c2e8097e364 | |
| parent | 78832a88e67b4c5e71926949aff401d2a1241b15 (diff) | |
m68k/defconfig: Update defconfigs for v4.5-rc1
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
| -rw-r--r-- | arch/m68k/configs/amiga_defconfig | 9 | ||||
| -rw-r--r-- | arch/m68k/configs/apollo_defconfig | 9 | ||||
| -rw-r--r-- | arch/m68k/configs/atari_defconfig | 9 | ||||
| -rw-r--r-- | arch/m68k/configs/bvme6000_defconfig | 9 | ||||
| -rw-r--r-- | arch/m68k/configs/hp300_defconfig | 9 | ||||
| -rw-r--r-- | arch/m68k/configs/mac_defconfig | 9 | ||||
| -rw-r--r-- | arch/m68k/configs/multi_defconfig | 9 | ||||
| -rw-r--r-- | arch/m68k/configs/mvme147_defconfig | 9 | ||||
| -rw-r--r-- | arch/m68k/configs/mvme16x_defconfig | 9 | ||||
| -rw-r--r-- | arch/m68k/configs/q40_defconfig | 9 | ||||
| -rw-r--r-- | arch/m68k/configs/sun3_defconfig | 9 | ||||
| -rw-r--r-- | arch/m68k/configs/sun3x_defconfig | 9 |
12 files changed, 108 insertions, 0 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index fc96e814188e..d1fc4796025e 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
| @@ -108,6 +108,8 @@ CONFIG_NFT_NAT=m | |||
| 108 | CONFIG_NFT_QUEUE=m | 108 | CONFIG_NFT_QUEUE=m |
| 109 | CONFIG_NFT_REJECT=m | 109 | CONFIG_NFT_REJECT=m |
| 110 | CONFIG_NFT_COMPAT=m | 110 | CONFIG_NFT_COMPAT=m |
| 111 | CONFIG_NFT_DUP_NETDEV=m | ||
| 112 | CONFIG_NFT_FWD_NETDEV=m | ||
| 111 | CONFIG_NETFILTER_XT_SET=m | 113 | CONFIG_NETFILTER_XT_SET=m |
| 112 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 114 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
| 113 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 115 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| @@ -266,6 +268,12 @@ CONFIG_L2TP=m | |||
| 266 | CONFIG_BRIDGE=m | 268 | CONFIG_BRIDGE=m |
| 267 | CONFIG_ATALK=m | 269 | CONFIG_ATALK=m |
| 268 | CONFIG_6LOWPAN=m | 270 | CONFIG_6LOWPAN=m |
| 271 | CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m | ||
| 272 | CONFIG_6LOWPAN_GHC_UDP=m | ||
| 273 | CONFIG_6LOWPAN_GHC_ICMPV6=m | ||
| 274 | CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m | ||
| 275 | CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m | ||
| 276 | CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m | ||
| 269 | CONFIG_DNS_RESOLVER=y | 277 | CONFIG_DNS_RESOLVER=y |
| 270 | CONFIG_BATMAN_ADV=m | 278 | CONFIG_BATMAN_ADV=m |
| 271 | CONFIG_BATMAN_ADV_DAT=y | 279 | CONFIG_BATMAN_ADV_DAT=y |
| @@ -366,6 +374,7 @@ CONFIG_ARIADNE=y | |||
| 366 | # CONFIG_NET_VENDOR_INTEL is not set | 374 | # CONFIG_NET_VENDOR_INTEL is not set |
| 367 | # CONFIG_NET_VENDOR_MARVELL is not set | 375 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 368 | # CONFIG_NET_VENDOR_MICREL is not set | 376 | # CONFIG_NET_VENDOR_MICREL is not set |
| 377 | # CONFIG_NET_VENDOR_NETRONOME is not set | ||
| 369 | CONFIG_HYDRA=y | 378 | CONFIG_HYDRA=y |
| 370 | CONFIG_APNE=y | 379 | CONFIG_APNE=y |
| 371 | CONFIG_ZORRO8390=y | 380 | CONFIG_ZORRO8390=y |
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 05c904f08d9d..9bfe8be3658c 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
| @@ -106,6 +106,8 @@ CONFIG_NFT_NAT=m | |||
| 106 | CONFIG_NFT_QUEUE=m | 106 | CONFIG_NFT_QUEUE=m |
| 107 | CONFIG_NFT_REJECT=m | 107 | CONFIG_NFT_REJECT=m |
| 108 | CONFIG_NFT_COMPAT=m | 108 | CONFIG_NFT_COMPAT=m |
| 109 | CONFIG_NFT_DUP_NETDEV=m | ||
| 110 | CONFIG_NFT_FWD_NETDEV=m | ||
| 109 | CONFIG_NETFILTER_XT_SET=m | 111 | CONFIG_NETFILTER_XT_SET=m |
| 110 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 112 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
| 111 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 113 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| @@ -264,6 +266,12 @@ CONFIG_L2TP=m | |||
| 264 | CONFIG_BRIDGE=m | 266 | CONFIG_BRIDGE=m |
| 265 | CONFIG_ATALK=m | 267 | CONFIG_ATALK=m |
| 266 | CONFIG_6LOWPAN=m | 268 | CONFIG_6LOWPAN=m |
| 269 | CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m | ||
| 270 | CONFIG_6LOWPAN_GHC_UDP=m | ||
| 271 | CONFIG_6LOWPAN_GHC_ICMPV6=m | ||
| 272 | CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m | ||
| 273 | CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m | ||
| 274 | CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m | ||
| 267 | CONFIG_DNS_RESOLVER=y | 275 | CONFIG_DNS_RESOLVER=y |
| 268 | CONFIG_BATMAN_ADV=m | 276 | CONFIG_BATMAN_ADV=m |
| 269 | CONFIG_BATMAN_ADV_DAT=y | 277 | CONFIG_BATMAN_ADV_DAT=y |
| @@ -344,6 +352,7 @@ CONFIG_VETH=m | |||
| 344 | # CONFIG_NET_VENDOR_MARVELL is not set | 352 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 345 | # CONFIG_NET_VENDOR_MICREL is not set | 353 | # CONFIG_NET_VENDOR_MICREL is not set |
| 346 | # CONFIG_NET_VENDOR_NATSEMI is not set | 354 | # CONFIG_NET_VENDOR_NATSEMI is not set |
| 355 | # CONFIG_NET_VENDOR_NETRONOME is not set | ||
| 347 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 356 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
| 348 | # CONFIG_NET_VENDOR_RENESAS is not set | 357 | # CONFIG_NET_VENDOR_RENESAS is not set |
| 349 | # CONFIG_NET_VENDOR_ROCKER is not set | 358 | # CONFIG_NET_VENDOR_ROCKER is not set |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index d572b731c510..ebdcfae55580 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
| @@ -106,6 +106,8 @@ CONFIG_NFT_NAT=m | |||
| 106 | CONFIG_NFT_QUEUE=m | 106 | CONFIG_NFT_QUEUE=m |
| 107 | CONFIG_NFT_REJECT=m | 107 | CONFIG_NFT_REJECT=m |
| 108 | CONFIG_NFT_COMPAT=m | 108 | CONFIG_NFT_COMPAT=m |
| 109 | CONFIG_NFT_DUP_NETDEV=m | ||
| 110 | CONFIG_NFT_FWD_NETDEV=m | ||
| 109 | CONFIG_NETFILTER_XT_SET=m | 111 | CONFIG_NETFILTER_XT_SET=m |
| 110 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 112 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
| 111 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 113 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| @@ -264,6 +266,12 @@ CONFIG_L2TP=m | |||
| 264 | CONFIG_BRIDGE=m | 266 | CONFIG_BRIDGE=m |
| 265 | CONFIG_ATALK=m | 267 | CONFIG_ATALK=m |
| 266 | CONFIG_6LOWPAN=m | 268 | CONFIG_6LOWPAN=m |
| 269 | CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m | ||
| 270 | CONFIG_6LOWPAN_GHC_UDP=m | ||
| 271 | CONFIG_6LOWPAN_GHC_ICMPV6=m | ||
| 272 | CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m | ||
| 273 | CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m | ||
| 274 | CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m | ||
| 267 | CONFIG_DNS_RESOLVER=y | 275 | CONFIG_DNS_RESOLVER=y |
| 268 | CONFIG_BATMAN_ADV=m | 276 | CONFIG_BATMAN_ADV=m |
| 269 | CONFIG_BATMAN_ADV_DAT=y | 277 | CONFIG_BATMAN_ADV_DAT=y |
| @@ -353,6 +361,7 @@ CONFIG_ATARILANCE=y | |||
| 353 | # CONFIG_NET_VENDOR_INTEL is not set | 361 | # CONFIG_NET_VENDOR_INTEL is not set |
| 354 | # CONFIG_NET_VENDOR_MARVELL is not set | 362 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 355 | # CONFIG_NET_VENDOR_MICREL is not set | 363 | # CONFIG_NET_VENDOR_MICREL is not set |
| 364 | # CONFIG_NET_VENDOR_NETRONOME is not set | ||
| 356 | CONFIG_NE2000=y | 365 | CONFIG_NE2000=y |
| 357 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 366 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
| 358 | # CONFIG_NET_VENDOR_RENESAS is not set | 367 | # CONFIG_NET_VENDOR_RENESAS is not set |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index 11a30c65ad44..8acc65e54995 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
| @@ -104,6 +104,8 @@ CONFIG_NFT_NAT=m | |||
| 104 | CONFIG_NFT_QUEUE=m | 104 | CONFIG_NFT_QUEUE=m |
| 105 | CONFIG_NFT_REJECT=m | 105 | CONFIG_NFT_REJECT=m |
| 106 | CONFIG_NFT_COMPAT=m | 106 | CONFIG_NFT_COMPAT=m |
| 107 | CONFIG_NFT_DUP_NETDEV=m | ||
| 108 | CONFIG_NFT_FWD_NETDEV=m | ||
| 107 | CONFIG_NETFILTER_XT_SET=m | 109 | CONFIG_NETFILTER_XT_SET=m |
| 108 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 110 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
| 109 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 111 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| @@ -262,6 +264,12 @@ CONFIG_L2TP=m | |||
| 262 | CONFIG_BRIDGE=m | 264 | CONFIG_BRIDGE=m |
| 263 | CONFIG_ATALK=m | 265 | CONFIG_ATALK=m |
| 264 | CONFIG_6LOWPAN=m | 266 | CONFIG_6LOWPAN=m |
| 267 | CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m | ||
| 268 | CONFIG_6LOWPAN_GHC_UDP=m | ||
| 269 | CONFIG_6LOWPAN_GHC_ICMPV6=m | ||
| 270 | CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m | ||
| 271 | CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m | ||
| 272 | CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m | ||
| 265 | CONFIG_DNS_RESOLVER=y | 273 | CONFIG_DNS_RESOLVER=y |
| 266 | CONFIG_BATMAN_ADV=m | 274 | CONFIG_BATMAN_ADV=m |
| 267 | CONFIG_BATMAN_ADV_DAT=y | 275 | CONFIG_BATMAN_ADV_DAT=y |
| @@ -343,6 +351,7 @@ CONFIG_BVME6000_NET=y | |||
| 343 | # CONFIG_NET_VENDOR_MARVELL is not set | 351 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 344 | # CONFIG_NET_VENDOR_MICREL is not set | 352 | # CONFIG_NET_VENDOR_MICREL is not set |
| 345 | # CONFIG_NET_VENDOR_NATSEMI is not set | 353 | # CONFIG_NET_VENDOR_NATSEMI is not set |
| 354 | # CONFIG_NET_VENDOR_NETRONOME is not set | ||
| 346 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 355 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
| 347 | # CONFIG_NET_VENDOR_RENESAS is not set | 356 | # CONFIG_NET_VENDOR_RENESAS is not set |
| 348 | # CONFIG_NET_VENDOR_ROCKER is not set | 357 | # CONFIG_NET_VENDOR_ROCKER is not set |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 6630a5154b9d..0c6a3d52b26e 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig | |||
| @@ -106,6 +106,8 @@ CONFIG_NFT_NAT=m | |||
| 106 | CONFIG_NFT_QUEUE=m | 106 | CONFIG_NFT_QUEUE=m |
| 107 | CONFIG_NFT_REJECT=m | 107 | CONFIG_NFT_REJECT=m |
| 108 | CONFIG_NFT_COMPAT=m | 108 | CONFIG_NFT_COMPAT=m |
| 109 | CONFIG_NFT_DUP_NETDEV=m | ||
| 110 | CONFIG_NFT_FWD_NETDEV=m | ||
| 109 | CONFIG_NETFILTER_XT_SET=m | 111 | CONFIG_NETFILTER_XT_SET=m |
| 110 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 112 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
| 111 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 113 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| @@ -264,6 +266,12 @@ CONFIG_L2TP=m | |||
| 264 | CONFIG_BRIDGE=m | 266 | CONFIG_BRIDGE=m |
| 265 | CONFIG_ATALK=m | 267 | CONFIG_ATALK=m |
| 266 | CONFIG_6LOWPAN=m | 268 | CONFIG_6LOWPAN=m |
| 269 | CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m | ||
| 270 | CONFIG_6LOWPAN_GHC_UDP=m | ||
| 271 | CONFIG_6LOWPAN_GHC_ICMPV6=m | ||
| 272 | CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m | ||
| 273 | CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m | ||
| 274 | CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m | ||
| 267 | CONFIG_DNS_RESOLVER=y | 275 | CONFIG_DNS_RESOLVER=y |
| 268 | CONFIG_BATMAN_ADV=m | 276 | CONFIG_BATMAN_ADV=m |
| 269 | CONFIG_BATMAN_ADV_DAT=y | 277 | CONFIG_BATMAN_ADV_DAT=y |
| @@ -345,6 +353,7 @@ CONFIG_HPLANCE=y | |||
| 345 | # CONFIG_NET_VENDOR_MARVELL is not set | 353 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 346 | # CONFIG_NET_VENDOR_MICREL is not set | 354 | # CONFIG_NET_VENDOR_MICREL is not set |
| 347 | # CONFIG_NET_VENDOR_NATSEMI is not set | 355 | # CONFIG_NET_VENDOR_NATSEMI is not set |
| 356 | # CONFIG_NET_VENDOR_NETRONOME is not set | ||
| 348 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 357 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
| 349 | # CONFIG_NET_VENDOR_RENESAS is not set | 358 | # CONFIG_NET_VENDOR_RENESAS is not set |
| 350 | # CONFIG_NET_VENDOR_ROCKER is not set | 359 | # CONFIG_NET_VENDOR_ROCKER is not set |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index 1d90b71d0903..12a8a6cb32f4 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
| @@ -105,6 +105,8 @@ CONFIG_NFT_NAT=m | |||
| 105 | CONFIG_NFT_QUEUE=m | 105 | CONFIG_NFT_QUEUE=m |
| 106 | CONFIG_NFT_REJECT=m | 106 | CONFIG_NFT_REJECT=m |
| 107 | CONFIG_NFT_COMPAT=m | 107 | CONFIG_NFT_COMPAT=m |
| 108 | CONFIG_NFT_DUP_NETDEV=m | ||
| 109 | CONFIG_NFT_FWD_NETDEV=m | ||
| 108 | CONFIG_NETFILTER_XT_SET=m | 110 | CONFIG_NETFILTER_XT_SET=m |
| 109 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 111 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
| 110 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 112 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| @@ -266,6 +268,12 @@ CONFIG_DEV_APPLETALK=m | |||
| 266 | CONFIG_IPDDP=m | 268 | CONFIG_IPDDP=m |
| 267 | CONFIG_IPDDP_ENCAP=y | 269 | CONFIG_IPDDP_ENCAP=y |
| 268 | CONFIG_6LOWPAN=m | 270 | CONFIG_6LOWPAN=m |
| 271 | CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m | ||
| 272 | CONFIG_6LOWPAN_GHC_UDP=m | ||
| 273 | CONFIG_6LOWPAN_GHC_ICMPV6=m | ||
| 274 | CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m | ||
| 275 | CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m | ||
| 276 | CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m | ||
| 269 | CONFIG_DNS_RESOLVER=y | 277 | CONFIG_DNS_RESOLVER=y |
| 270 | CONFIG_BATMAN_ADV=m | 278 | CONFIG_BATMAN_ADV=m |
| 271 | CONFIG_BATMAN_ADV_DAT=y | 279 | CONFIG_BATMAN_ADV_DAT=y |
| @@ -362,6 +370,7 @@ CONFIG_MAC89x0=y | |||
| 362 | # CONFIG_NET_VENDOR_MARVELL is not set | 370 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 363 | # CONFIG_NET_VENDOR_MICREL is not set | 371 | # CONFIG_NET_VENDOR_MICREL is not set |
| 364 | CONFIG_MACSONIC=y | 372 | CONFIG_MACSONIC=y |
| 373 | # CONFIG_NET_VENDOR_NETRONOME is not set | ||
| 365 | CONFIG_MAC8390=y | 374 | CONFIG_MAC8390=y |
| 366 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 375 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
| 367 | # CONFIG_NET_VENDOR_RENESAS is not set | 376 | # CONFIG_NET_VENDOR_RENESAS is not set |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 1fd21c1ca87f..64ff2dcb34c8 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
| @@ -115,6 +115,8 @@ CONFIG_NFT_NAT=m | |||
| 115 | CONFIG_NFT_QUEUE=m | 115 | CONFIG_NFT_QUEUE=m |
| 116 | CONFIG_NFT_REJECT=m | 116 | CONFIG_NFT_REJECT=m |
| 117 | CONFIG_NFT_COMPAT=m | 117 | CONFIG_NFT_COMPAT=m |
| 118 | CONFIG_NFT_DUP_NETDEV=m | ||
| 119 | CONFIG_NFT_FWD_NETDEV=m | ||
| 118 | CONFIG_NETFILTER_XT_SET=m | 120 | CONFIG_NETFILTER_XT_SET=m |
| 119 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 121 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
| 120 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 122 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| @@ -276,6 +278,12 @@ CONFIG_DEV_APPLETALK=m | |||
| 276 | CONFIG_IPDDP=m | 278 | CONFIG_IPDDP=m |
| 277 | CONFIG_IPDDP_ENCAP=y | 279 | CONFIG_IPDDP_ENCAP=y |
| 278 | CONFIG_6LOWPAN=m | 280 | CONFIG_6LOWPAN=m |
| 281 | CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m | ||
| 282 | CONFIG_6LOWPAN_GHC_UDP=m | ||
| 283 | CONFIG_6LOWPAN_GHC_ICMPV6=m | ||
| 284 | CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m | ||
| 285 | CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m | ||
| 286 | CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m | ||
| 279 | CONFIG_DNS_RESOLVER=y | 287 | CONFIG_DNS_RESOLVER=y |
| 280 | CONFIG_BATMAN_ADV=m | 288 | CONFIG_BATMAN_ADV=m |
| 281 | CONFIG_BATMAN_ADV_DAT=y | 289 | CONFIG_BATMAN_ADV_DAT=y |
| @@ -404,6 +412,7 @@ CONFIG_MVME16x_NET=y | |||
| 404 | # CONFIG_NET_VENDOR_MARVELL is not set | 412 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 405 | # CONFIG_NET_VENDOR_MICREL is not set | 413 | # CONFIG_NET_VENDOR_MICREL is not set |
| 406 | CONFIG_MACSONIC=y | 414 | CONFIG_MACSONIC=y |
| 415 | # CONFIG_NET_VENDOR_NETRONOME is not set | ||
| 407 | CONFIG_HYDRA=y | 416 | CONFIG_HYDRA=y |
| 408 | CONFIG_MAC8390=y | 417 | CONFIG_MAC8390=y |
| 409 | CONFIG_NE2000=y | 418 | CONFIG_NE2000=y |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index 74e10f79d7b1..07fc6abcfe0c 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig | |||
| @@ -103,6 +103,8 @@ CONFIG_NFT_NAT=m | |||
| 103 | CONFIG_NFT_QUEUE=m | 103 | CONFIG_NFT_QUEUE=m |
| 104 | CONFIG_NFT_REJECT=m | 104 | CONFIG_NFT_REJECT=m |
| 105 | CONFIG_NFT_COMPAT=m | 105 | CONFIG_NFT_COMPAT=m |
| 106 | CONFIG_NFT_DUP_NETDEV=m | ||
| 107 | CONFIG_NFT_FWD_NETDEV=m | ||
| 106 | CONFIG_NETFILTER_XT_SET=m | 108 | CONFIG_NETFILTER_XT_SET=m |
| 107 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 109 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
| 108 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 110 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| @@ -261,6 +263,12 @@ CONFIG_L2TP=m | |||
| 261 | CONFIG_BRIDGE=m | 263 | CONFIG_BRIDGE=m |
| 262 | CONFIG_ATALK=m | 264 | CONFIG_ATALK=m |
| 263 | CONFIG_6LOWPAN=m | 265 | CONFIG_6LOWPAN=m |
| 266 | CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m | ||
| 267 | CONFIG_6LOWPAN_GHC_UDP=m | ||
| 268 | CONFIG_6LOWPAN_GHC_ICMPV6=m | ||
| 269 | CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m | ||
| 270 | CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m | ||
| 271 | CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m | ||
| 264 | CONFIG_DNS_RESOLVER=y | 272 | CONFIG_DNS_RESOLVER=y |
| 265 | CONFIG_BATMAN_ADV=m | 273 | CONFIG_BATMAN_ADV=m |
| 266 | CONFIG_BATMAN_ADV_DAT=y | 274 | CONFIG_BATMAN_ADV_DAT=y |
| @@ -343,6 +351,7 @@ CONFIG_MVME147_NET=y | |||
| 343 | # CONFIG_NET_VENDOR_MARVELL is not set | 351 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 344 | # CONFIG_NET_VENDOR_MICREL is not set | 352 | # CONFIG_NET_VENDOR_MICREL is not set |
| 345 | # CONFIG_NET_VENDOR_NATSEMI is not set | 353 | # CONFIG_NET_VENDOR_NATSEMI is not set |
| 354 | # CONFIG_NET_VENDOR_NETRONOME is not set | ||
| 346 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 355 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
| 347 | # CONFIG_NET_VENDOR_RENESAS is not set | 356 | # CONFIG_NET_VENDOR_RENESAS is not set |
| 348 | # CONFIG_NET_VENDOR_ROCKER is not set | 357 | # CONFIG_NET_VENDOR_ROCKER is not set |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 7034e716f166..69903ded88f7 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
| @@ -104,6 +104,8 @@ CONFIG_NFT_NAT=m | |||
| 104 | CONFIG_NFT_QUEUE=m | 104 | CONFIG_NFT_QUEUE=m |
| 105 | CONFIG_NFT_REJECT=m | 105 | CONFIG_NFT_REJECT=m |
| 106 | CONFIG_NFT_COMPAT=m | 106 | CONFIG_NFT_COMPAT=m |
| 107 | CONFIG_NFT_DUP_NETDEV=m | ||
| 108 | CONFIG_NFT_FWD_NETDEV=m | ||
| 107 | CONFIG_NETFILTER_XT_SET=m | 109 | CONFIG_NETFILTER_XT_SET=m |
| 108 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 110 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
| 109 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 111 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| @@ -262,6 +264,12 @@ CONFIG_L2TP=m | |||
| 262 | CONFIG_BRIDGE=m | 264 | CONFIG_BRIDGE=m |
| 263 | CONFIG_ATALK=m | 265 | CONFIG_ATALK=m |
| 264 | CONFIG_6LOWPAN=m | 266 | CONFIG_6LOWPAN=m |
| 267 | CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m | ||
| 268 | CONFIG_6LOWPAN_GHC_UDP=m | ||
| 269 | CONFIG_6LOWPAN_GHC_ICMPV6=m | ||
| 270 | CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m | ||
| 271 | CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m | ||
| 272 | CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m | ||
| 265 | CONFIG_DNS_RESOLVER=y | 273 | CONFIG_DNS_RESOLVER=y |
| 266 | CONFIG_BATMAN_ADV=m | 274 | CONFIG_BATMAN_ADV=m |
| 267 | CONFIG_BATMAN_ADV_DAT=y | 275 | CONFIG_BATMAN_ADV_DAT=y |
| @@ -343,6 +351,7 @@ CONFIG_MVME16x_NET=y | |||
| 343 | # CONFIG_NET_VENDOR_MARVELL is not set | 351 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 344 | # CONFIG_NET_VENDOR_MICREL is not set | 352 | # CONFIG_NET_VENDOR_MICREL is not set |
| 345 | # CONFIG_NET_VENDOR_NATSEMI is not set | 353 | # CONFIG_NET_VENDOR_NATSEMI is not set |
| 354 | # CONFIG_NET_VENDOR_NETRONOME is not set | ||
| 346 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 355 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
| 347 | # CONFIG_NET_VENDOR_RENESAS is not set | 356 | # CONFIG_NET_VENDOR_RENESAS is not set |
| 348 | # CONFIG_NET_VENDOR_ROCKER is not set | 357 | # CONFIG_NET_VENDOR_ROCKER is not set |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index f7deb5f702a6..bd8401686dde 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig | |||
| @@ -104,6 +104,8 @@ CONFIG_NFT_NAT=m | |||
| 104 | CONFIG_NFT_QUEUE=m | 104 | CONFIG_NFT_QUEUE=m |
| 105 | CONFIG_NFT_REJECT=m | 105 | CONFIG_NFT_REJECT=m |
| 106 | CONFIG_NFT_COMPAT=m | 106 | CONFIG_NFT_COMPAT=m |
| 107 | CONFIG_NFT_DUP_NETDEV=m | ||
| 108 | CONFIG_NFT_FWD_NETDEV=m | ||
| 107 | CONFIG_NETFILTER_XT_SET=m | 109 | CONFIG_NETFILTER_XT_SET=m |
| 108 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 110 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
| 109 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 111 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| @@ -262,6 +264,12 @@ CONFIG_L2TP=m | |||
| 262 | CONFIG_BRIDGE=m | 264 | CONFIG_BRIDGE=m |
| 263 | CONFIG_ATALK=m | 265 | CONFIG_ATALK=m |
| 264 | CONFIG_6LOWPAN=m | 266 | CONFIG_6LOWPAN=m |
| 267 | CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m | ||
| 268 | CONFIG_6LOWPAN_GHC_UDP=m | ||
| 269 | CONFIG_6LOWPAN_GHC_ICMPV6=m | ||
| 270 | CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m | ||
| 271 | CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m | ||
| 272 | CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m | ||
| 265 | CONFIG_DNS_RESOLVER=y | 273 | CONFIG_DNS_RESOLVER=y |
| 266 | CONFIG_BATMAN_ADV=m | 274 | CONFIG_BATMAN_ADV=m |
| 267 | CONFIG_BATMAN_ADV_DAT=y | 275 | CONFIG_BATMAN_ADV_DAT=y |
| @@ -352,6 +360,7 @@ CONFIG_VETH=m | |||
| 352 | # CONFIG_NET_VENDOR_INTEL is not set | 360 | # CONFIG_NET_VENDOR_INTEL is not set |
| 353 | # CONFIG_NET_VENDOR_MARVELL is not set | 361 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 354 | # CONFIG_NET_VENDOR_MICREL is not set | 362 | # CONFIG_NET_VENDOR_MICREL is not set |
| 363 | # CONFIG_NET_VENDOR_NETRONOME is not set | ||
| 355 | CONFIG_NE2000=y | 364 | CONFIG_NE2000=y |
| 356 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 365 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
| 357 | # CONFIG_NET_VENDOR_RENESAS is not set | 366 | # CONFIG_NET_VENDOR_RENESAS is not set |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index 0ce79eb0d805..5f9fb3ab9636 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig | |||
| @@ -101,6 +101,8 @@ CONFIG_NFT_NAT=m | |||
| 101 | CONFIG_NFT_QUEUE=m | 101 | CONFIG_NFT_QUEUE=m |
| 102 | CONFIG_NFT_REJECT=m | 102 | CONFIG_NFT_REJECT=m |
| 103 | CONFIG_NFT_COMPAT=m | 103 | CONFIG_NFT_COMPAT=m |
| 104 | CONFIG_NFT_DUP_NETDEV=m | ||
| 105 | CONFIG_NFT_FWD_NETDEV=m | ||
| 104 | CONFIG_NETFILTER_XT_SET=m | 106 | CONFIG_NETFILTER_XT_SET=m |
| 105 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 107 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
| 106 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 108 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| @@ -259,6 +261,12 @@ CONFIG_L2TP=m | |||
| 259 | CONFIG_BRIDGE=m | 261 | CONFIG_BRIDGE=m |
| 260 | CONFIG_ATALK=m | 262 | CONFIG_ATALK=m |
| 261 | CONFIG_6LOWPAN=m | 263 | CONFIG_6LOWPAN=m |
| 264 | CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m | ||
| 265 | CONFIG_6LOWPAN_GHC_UDP=m | ||
| 266 | CONFIG_6LOWPAN_GHC_ICMPV6=m | ||
| 267 | CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m | ||
| 268 | CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m | ||
| 269 | CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m | ||
| 262 | CONFIG_DNS_RESOLVER=y | 270 | CONFIG_DNS_RESOLVER=y |
| 263 | CONFIG_BATMAN_ADV=m | 271 | CONFIG_BATMAN_ADV=m |
| 264 | CONFIG_BATMAN_ADV_DAT=y | 272 | CONFIG_BATMAN_ADV_DAT=y |
| @@ -340,6 +348,7 @@ CONFIG_SUN3_82586=y | |||
| 340 | # CONFIG_NET_VENDOR_MARVELL is not set | 348 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 341 | # CONFIG_NET_VENDOR_MICREL is not set | 349 | # CONFIG_NET_VENDOR_MICREL is not set |
| 342 | # CONFIG_NET_VENDOR_NATSEMI is not set | 350 | # CONFIG_NET_VENDOR_NATSEMI is not set |
| 351 | # CONFIG_NET_VENDOR_NETRONOME is not set | ||
| 343 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 352 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
| 344 | # CONFIG_NET_VENDOR_RENESAS is not set | 353 | # CONFIG_NET_VENDOR_RENESAS is not set |
| 345 | # CONFIG_NET_VENDOR_ROCKER is not set | 354 | # CONFIG_NET_VENDOR_ROCKER is not set |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 4cb787e4991f..5d1c674530e2 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
| @@ -101,6 +101,8 @@ CONFIG_NFT_NAT=m | |||
| 101 | CONFIG_NFT_QUEUE=m | 101 | CONFIG_NFT_QUEUE=m |
| 102 | CONFIG_NFT_REJECT=m | 102 | CONFIG_NFT_REJECT=m |
| 103 | CONFIG_NFT_COMPAT=m | 103 | CONFIG_NFT_COMPAT=m |
| 104 | CONFIG_NFT_DUP_NETDEV=m | ||
| 105 | CONFIG_NFT_FWD_NETDEV=m | ||
| 104 | CONFIG_NETFILTER_XT_SET=m | 106 | CONFIG_NETFILTER_XT_SET=m |
| 105 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | 107 | CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m |
| 106 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 108 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| @@ -259,6 +261,12 @@ CONFIG_L2TP=m | |||
| 259 | CONFIG_BRIDGE=m | 261 | CONFIG_BRIDGE=m |
| 260 | CONFIG_ATALK=m | 262 | CONFIG_ATALK=m |
| 261 | CONFIG_6LOWPAN=m | 263 | CONFIG_6LOWPAN=m |
| 264 | CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m | ||
| 265 | CONFIG_6LOWPAN_GHC_UDP=m | ||
| 266 | CONFIG_6LOWPAN_GHC_ICMPV6=m | ||
| 267 | CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m | ||
| 268 | CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m | ||
| 269 | CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m | ||
| 262 | CONFIG_DNS_RESOLVER=y | 270 | CONFIG_DNS_RESOLVER=y |
| 263 | CONFIG_BATMAN_ADV=m | 271 | CONFIG_BATMAN_ADV=m |
| 264 | CONFIG_BATMAN_ADV_DAT=y | 272 | CONFIG_BATMAN_ADV_DAT=y |
| @@ -341,6 +349,7 @@ CONFIG_SUN3LANCE=y | |||
| 341 | # CONFIG_NET_VENDOR_MARVELL is not set | 349 | # CONFIG_NET_VENDOR_MARVELL is not set |
| 342 | # CONFIG_NET_VENDOR_MICREL is not set | 350 | # CONFIG_NET_VENDOR_MICREL is not set |
| 343 | # CONFIG_NET_VENDOR_NATSEMI is not set | 351 | # CONFIG_NET_VENDOR_NATSEMI is not set |
| 352 | # CONFIG_NET_VENDOR_NETRONOME is not set | ||
| 344 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 353 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
| 345 | # CONFIG_NET_VENDOR_RENESAS is not set | 354 | # CONFIG_NET_VENDOR_RENESAS is not set |
| 346 | # CONFIG_NET_VENDOR_ROCKER is not set | 355 | # CONFIG_NET_VENDOR_ROCKER is not set |
