diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-04-17 04:21:01 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-05-28 04:11:53 -0400 |
commit | 44074e892cc2e5579b8d75c37612fcf8d023554a (patch) | |
tree | 6e87f9bff97ad6f3079f682ecfe57cfc73b313c6 /arch/m68k/configs | |
parent | 83adc18110d632eebefb5c2a1dd27b58ae843d64 (diff) |
m68k: Update defconfigs for v3.15-rc2
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/configs')
-rw-r--r-- | arch/m68k/configs/amiga_defconfig | 5 | ||||
-rw-r--r-- | arch/m68k/configs/apollo_defconfig | 5 | ||||
-rw-r--r-- | arch/m68k/configs/atari_defconfig | 5 | ||||
-rw-r--r-- | arch/m68k/configs/bvme6000_defconfig | 5 | ||||
-rw-r--r-- | arch/m68k/configs/hp300_defconfig | 5 | ||||
-rw-r--r-- | arch/m68k/configs/mac_defconfig | 5 | ||||
-rw-r--r-- | arch/m68k/configs/multi_defconfig | 5 | ||||
-rw-r--r-- | arch/m68k/configs/mvme147_defconfig | 5 | ||||
-rw-r--r-- | arch/m68k/configs/mvme16x_defconfig | 5 | ||||
-rw-r--r-- | arch/m68k/configs/q40_defconfig | 5 | ||||
-rw-r--r-- | arch/m68k/configs/sun3_defconfig | 5 | ||||
-rw-r--r-- | arch/m68k/configs/sun3x_defconfig | 5 |
12 files changed, 48 insertions, 12 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 96da4963d14b..d7eac833a94f 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
@@ -159,6 +159,7 @@ CONFIG_IP_SET_BITMAP_IP=m | |||
159 | CONFIG_IP_SET_BITMAP_IPMAC=m | 159 | CONFIG_IP_SET_BITMAP_IPMAC=m |
160 | CONFIG_IP_SET_BITMAP_PORT=m | 160 | CONFIG_IP_SET_BITMAP_PORT=m |
161 | CONFIG_IP_SET_HASH_IP=m | 161 | CONFIG_IP_SET_HASH_IP=m |
162 | CONFIG_IP_SET_HASH_IPMARK=m | ||
162 | CONFIG_IP_SET_HASH_IPPORT=m | 163 | CONFIG_IP_SET_HASH_IPPORT=m |
163 | CONFIG_IP_SET_HASH_IPPORTIP=m | 164 | CONFIG_IP_SET_HASH_IPPORTIP=m |
164 | CONFIG_IP_SET_HASH_IPPORTNET=m | 165 | CONFIG_IP_SET_HASH_IPPORTNET=m |
@@ -227,6 +228,7 @@ CONFIG_DNS_RESOLVER=y | |||
227 | CONFIG_BATMAN_ADV=m | 228 | CONFIG_BATMAN_ADV=m |
228 | CONFIG_BATMAN_ADV_DAT=y | 229 | CONFIG_BATMAN_ADV_DAT=y |
229 | CONFIG_BATMAN_ADV_NC=y | 230 | CONFIG_BATMAN_ADV_NC=y |
231 | CONFIG_BATMAN_ADV_MCAST=y | ||
230 | CONFIG_NETLINK_DIAG=m | 232 | CONFIG_NETLINK_DIAG=m |
231 | CONFIG_NET_MPLS_GSO=m | 233 | CONFIG_NET_MPLS_GSO=m |
232 | # CONFIG_WIRELESS is not set | 234 | # CONFIG_WIRELESS is not set |
@@ -279,6 +281,7 @@ CONFIG_DM_CRYPT=m | |||
279 | CONFIG_DM_SNAPSHOT=m | 281 | CONFIG_DM_SNAPSHOT=m |
280 | CONFIG_DM_THIN_PROVISIONING=m | 282 | CONFIG_DM_THIN_PROVISIONING=m |
281 | CONFIG_DM_CACHE=m | 283 | CONFIG_DM_CACHE=m |
284 | CONFIG_DM_ERA=m | ||
282 | CONFIG_DM_MIRROR=m | 285 | CONFIG_DM_MIRROR=m |
283 | CONFIG_DM_RAID=m | 286 | CONFIG_DM_RAID=m |
284 | CONFIG_DM_ZERO=m | 287 | CONFIG_DM_ZERO=m |
@@ -305,7 +308,6 @@ CONFIG_VETH=m | |||
305 | CONFIG_A2065=y | 308 | CONFIG_A2065=y |
306 | CONFIG_ARIADNE=y | 309 | CONFIG_ARIADNE=y |
307 | # CONFIG_NET_VENDOR_ARC is not set | 310 | # CONFIG_NET_VENDOR_ARC is not set |
308 | # CONFIG_NET_CADENCE is not set | ||
309 | # CONFIG_NET_VENDOR_BROADCOM is not set | 311 | # CONFIG_NET_VENDOR_BROADCOM is not set |
310 | # CONFIG_NET_VENDOR_CIRRUS is not set | 312 | # CONFIG_NET_VENDOR_CIRRUS is not set |
311 | # CONFIG_NET_VENDOR_HP is not set | 313 | # CONFIG_NET_VENDOR_HP is not set |
@@ -315,6 +317,7 @@ CONFIG_ARIADNE=y | |||
315 | CONFIG_HYDRA=y | 317 | CONFIG_HYDRA=y |
316 | CONFIG_APNE=y | 318 | CONFIG_APNE=y |
317 | CONFIG_ZORRO8390=y | 319 | CONFIG_ZORRO8390=y |
320 | # CONFIG_NET_VENDOR_SAMSUNG is not set | ||
318 | # CONFIG_NET_VENDOR_SEEQ is not set | 321 | # CONFIG_NET_VENDOR_SEEQ is not set |
319 | # CONFIG_NET_VENDOR_SMSC is not set | 322 | # CONFIG_NET_VENDOR_SMSC is not set |
320 | # CONFIG_NET_VENDOR_STMICRO is not set | 323 | # CONFIG_NET_VENDOR_STMICRO is not set |
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 1b8739f50cbf..650ee75de6cd 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
@@ -157,6 +157,7 @@ CONFIG_IP_SET_BITMAP_IP=m | |||
157 | CONFIG_IP_SET_BITMAP_IPMAC=m | 157 | CONFIG_IP_SET_BITMAP_IPMAC=m |
158 | CONFIG_IP_SET_BITMAP_PORT=m | 158 | CONFIG_IP_SET_BITMAP_PORT=m |
159 | CONFIG_IP_SET_HASH_IP=m | 159 | CONFIG_IP_SET_HASH_IP=m |
160 | CONFIG_IP_SET_HASH_IPMARK=m | ||
160 | CONFIG_IP_SET_HASH_IPPORT=m | 161 | CONFIG_IP_SET_HASH_IPPORT=m |
161 | CONFIG_IP_SET_HASH_IPPORTIP=m | 162 | CONFIG_IP_SET_HASH_IPPORTIP=m |
162 | CONFIG_IP_SET_HASH_IPPORTNET=m | 163 | CONFIG_IP_SET_HASH_IPPORTNET=m |
@@ -225,6 +226,7 @@ CONFIG_DNS_RESOLVER=y | |||
225 | CONFIG_BATMAN_ADV=m | 226 | CONFIG_BATMAN_ADV=m |
226 | CONFIG_BATMAN_ADV_DAT=y | 227 | CONFIG_BATMAN_ADV_DAT=y |
227 | CONFIG_BATMAN_ADV_NC=y | 228 | CONFIG_BATMAN_ADV_NC=y |
229 | CONFIG_BATMAN_ADV_MCAST=y | ||
228 | CONFIG_NETLINK_DIAG=m | 230 | CONFIG_NETLINK_DIAG=m |
229 | CONFIG_NET_MPLS_GSO=m | 231 | CONFIG_NET_MPLS_GSO=m |
230 | # CONFIG_WIRELESS is not set | 232 | # CONFIG_WIRELESS is not set |
@@ -261,6 +263,7 @@ CONFIG_DM_CRYPT=m | |||
261 | CONFIG_DM_SNAPSHOT=m | 263 | CONFIG_DM_SNAPSHOT=m |
262 | CONFIG_DM_THIN_PROVISIONING=m | 264 | CONFIG_DM_THIN_PROVISIONING=m |
263 | CONFIG_DM_CACHE=m | 265 | CONFIG_DM_CACHE=m |
266 | CONFIG_DM_ERA=m | ||
264 | CONFIG_DM_MIRROR=m | 267 | CONFIG_DM_MIRROR=m |
265 | CONFIG_DM_RAID=m | 268 | CONFIG_DM_RAID=m |
266 | CONFIG_DM_ZERO=m | 269 | CONFIG_DM_ZERO=m |
@@ -284,12 +287,12 @@ CONFIG_NETCONSOLE=m | |||
284 | CONFIG_NETCONSOLE_DYNAMIC=y | 287 | CONFIG_NETCONSOLE_DYNAMIC=y |
285 | CONFIG_VETH=m | 288 | CONFIG_VETH=m |
286 | # CONFIG_NET_VENDOR_ARC is not set | 289 | # CONFIG_NET_VENDOR_ARC is not set |
287 | # CONFIG_NET_CADENCE is not set | ||
288 | # CONFIG_NET_VENDOR_BROADCOM is not set | 290 | # CONFIG_NET_VENDOR_BROADCOM is not set |
289 | # CONFIG_NET_VENDOR_INTEL is not set | 291 | # CONFIG_NET_VENDOR_INTEL is not set |
290 | # CONFIG_NET_VENDOR_MARVELL is not set | 292 | # CONFIG_NET_VENDOR_MARVELL is not set |
291 | # CONFIG_NET_VENDOR_MICREL is not set | 293 | # CONFIG_NET_VENDOR_MICREL is not set |
292 | # CONFIG_NET_VENDOR_NATSEMI is not set | 294 | # CONFIG_NET_VENDOR_NATSEMI is not set |
295 | # CONFIG_NET_VENDOR_SAMSUNG is not set | ||
293 | # CONFIG_NET_VENDOR_SEEQ is not set | 296 | # CONFIG_NET_VENDOR_SEEQ is not set |
294 | # CONFIG_NET_VENDOR_STMICRO is not set | 297 | # CONFIG_NET_VENDOR_STMICRO is not set |
295 | # CONFIG_NET_VENDOR_VIA is not set | 298 | # CONFIG_NET_VENDOR_VIA is not set |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 6ea4e91f0caa..3142e69342fa 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
@@ -156,6 +156,7 @@ CONFIG_IP_SET_BITMAP_IP=m | |||
156 | CONFIG_IP_SET_BITMAP_IPMAC=m | 156 | CONFIG_IP_SET_BITMAP_IPMAC=m |
157 | CONFIG_IP_SET_BITMAP_PORT=m | 157 | CONFIG_IP_SET_BITMAP_PORT=m |
158 | CONFIG_IP_SET_HASH_IP=m | 158 | CONFIG_IP_SET_HASH_IP=m |
159 | CONFIG_IP_SET_HASH_IPMARK=m | ||
159 | CONFIG_IP_SET_HASH_IPPORT=m | 160 | CONFIG_IP_SET_HASH_IPPORT=m |
160 | CONFIG_IP_SET_HASH_IPPORTIP=m | 161 | CONFIG_IP_SET_HASH_IPPORTIP=m |
161 | CONFIG_IP_SET_HASH_IPPORTNET=m | 162 | CONFIG_IP_SET_HASH_IPPORTNET=m |
@@ -224,6 +225,7 @@ CONFIG_DNS_RESOLVER=y | |||
224 | CONFIG_BATMAN_ADV=m | 225 | CONFIG_BATMAN_ADV=m |
225 | CONFIG_BATMAN_ADV_DAT=y | 226 | CONFIG_BATMAN_ADV_DAT=y |
226 | CONFIG_BATMAN_ADV_NC=y | 227 | CONFIG_BATMAN_ADV_NC=y |
228 | CONFIG_BATMAN_ADV_MCAST=y | ||
227 | CONFIG_NETLINK_DIAG=m | 229 | CONFIG_NETLINK_DIAG=m |
228 | CONFIG_NET_MPLS_GSO=m | 230 | CONFIG_NET_MPLS_GSO=m |
229 | # CONFIG_WIRELESS is not set | 231 | # CONFIG_WIRELESS is not set |
@@ -269,6 +271,7 @@ CONFIG_DM_CRYPT=m | |||
269 | CONFIG_DM_SNAPSHOT=m | 271 | CONFIG_DM_SNAPSHOT=m |
270 | CONFIG_DM_THIN_PROVISIONING=m | 272 | CONFIG_DM_THIN_PROVISIONING=m |
271 | CONFIG_DM_CACHE=m | 273 | CONFIG_DM_CACHE=m |
274 | CONFIG_DM_ERA=m | ||
272 | CONFIG_DM_MIRROR=m | 275 | CONFIG_DM_MIRROR=m |
273 | CONFIG_DM_RAID=m | 276 | CONFIG_DM_RAID=m |
274 | CONFIG_DM_ZERO=m | 277 | CONFIG_DM_ZERO=m |
@@ -293,11 +296,11 @@ CONFIG_NETCONSOLE_DYNAMIC=y | |||
293 | CONFIG_VETH=m | 296 | CONFIG_VETH=m |
294 | CONFIG_ATARILANCE=y | 297 | CONFIG_ATARILANCE=y |
295 | # CONFIG_NET_VENDOR_ARC is not set | 298 | # CONFIG_NET_VENDOR_ARC is not set |
296 | # CONFIG_NET_CADENCE is not set | ||
297 | # CONFIG_NET_VENDOR_BROADCOM is not set | 299 | # CONFIG_NET_VENDOR_BROADCOM is not set |
298 | # CONFIG_NET_VENDOR_INTEL is not set | 300 | # CONFIG_NET_VENDOR_INTEL is not set |
299 | # CONFIG_NET_VENDOR_MARVELL is not set | 301 | # CONFIG_NET_VENDOR_MARVELL is not set |
300 | # CONFIG_NET_VENDOR_MICREL is not set | 302 | # CONFIG_NET_VENDOR_MICREL is not set |
303 | # CONFIG_NET_VENDOR_SAMSUNG is not set | ||
301 | # CONFIG_NET_VENDOR_SEEQ is not set | 304 | # CONFIG_NET_VENDOR_SEEQ is not set |
302 | # CONFIG_NET_VENDOR_STMICRO is not set | 305 | # CONFIG_NET_VENDOR_STMICRO is not set |
303 | # CONFIG_NET_VENDOR_VIA is not set | 306 | # CONFIG_NET_VENDOR_VIA is not set |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index e5a12739ff2d..0daa8a172f30 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
@@ -155,6 +155,7 @@ CONFIG_IP_SET_BITMAP_IP=m | |||
155 | CONFIG_IP_SET_BITMAP_IPMAC=m | 155 | CONFIG_IP_SET_BITMAP_IPMAC=m |
156 | CONFIG_IP_SET_BITMAP_PORT=m | 156 | CONFIG_IP_SET_BITMAP_PORT=m |
157 | CONFIG_IP_SET_HASH_IP=m | 157 | CONFIG_IP_SET_HASH_IP=m |
158 | CONFIG_IP_SET_HASH_IPMARK=m | ||
158 | CONFIG_IP_SET_HASH_IPPORT=m | 159 | CONFIG_IP_SET_HASH_IPPORT=m |
159 | CONFIG_IP_SET_HASH_IPPORTIP=m | 160 | CONFIG_IP_SET_HASH_IPPORTIP=m |
160 | CONFIG_IP_SET_HASH_IPPORTNET=m | 161 | CONFIG_IP_SET_HASH_IPPORTNET=m |
@@ -223,6 +224,7 @@ CONFIG_DNS_RESOLVER=y | |||
223 | CONFIG_BATMAN_ADV=m | 224 | CONFIG_BATMAN_ADV=m |
224 | CONFIG_BATMAN_ADV_DAT=y | 225 | CONFIG_BATMAN_ADV_DAT=y |
225 | CONFIG_BATMAN_ADV_NC=y | 226 | CONFIG_BATMAN_ADV_NC=y |
227 | CONFIG_BATMAN_ADV_MCAST=y | ||
226 | CONFIG_NETLINK_DIAG=m | 228 | CONFIG_NETLINK_DIAG=m |
227 | CONFIG_NET_MPLS_GSO=m | 229 | CONFIG_NET_MPLS_GSO=m |
228 | # CONFIG_WIRELESS is not set | 230 | # CONFIG_WIRELESS is not set |
@@ -260,6 +262,7 @@ CONFIG_DM_CRYPT=m | |||
260 | CONFIG_DM_SNAPSHOT=m | 262 | CONFIG_DM_SNAPSHOT=m |
261 | CONFIG_DM_THIN_PROVISIONING=m | 263 | CONFIG_DM_THIN_PROVISIONING=m |
262 | CONFIG_DM_CACHE=m | 264 | CONFIG_DM_CACHE=m |
265 | CONFIG_DM_ERA=m | ||
263 | CONFIG_DM_MIRROR=m | 266 | CONFIG_DM_MIRROR=m |
264 | CONFIG_DM_RAID=m | 267 | CONFIG_DM_RAID=m |
265 | CONFIG_DM_ZERO=m | 268 | CONFIG_DM_ZERO=m |
@@ -283,12 +286,12 @@ CONFIG_NETCONSOLE=m | |||
283 | CONFIG_NETCONSOLE_DYNAMIC=y | 286 | CONFIG_NETCONSOLE_DYNAMIC=y |
284 | CONFIG_VETH=m | 287 | CONFIG_VETH=m |
285 | # CONFIG_NET_VENDOR_ARC is not set | 288 | # CONFIG_NET_VENDOR_ARC is not set |
286 | # CONFIG_NET_CADENCE is not set | ||
287 | # CONFIG_NET_VENDOR_BROADCOM is not set | 289 | # CONFIG_NET_VENDOR_BROADCOM is not set |
288 | CONFIG_BVME6000_NET=y | 290 | CONFIG_BVME6000_NET=y |
289 | # CONFIG_NET_VENDOR_MARVELL is not set | 291 | # CONFIG_NET_VENDOR_MARVELL is not set |
290 | # CONFIG_NET_VENDOR_MICREL is not set | 292 | # CONFIG_NET_VENDOR_MICREL is not set |
291 | # CONFIG_NET_VENDOR_NATSEMI is not set | 293 | # CONFIG_NET_VENDOR_NATSEMI is not set |
294 | # CONFIG_NET_VENDOR_SAMSUNG is not set | ||
292 | # CONFIG_NET_VENDOR_SEEQ is not set | 295 | # CONFIG_NET_VENDOR_SEEQ is not set |
293 | # CONFIG_NET_VENDOR_STMICRO is not set | 296 | # CONFIG_NET_VENDOR_STMICRO is not set |
294 | # CONFIG_NET_VENDOR_VIA is not set | 297 | # CONFIG_NET_VENDOR_VIA is not set |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 8936d7fb0f0f..88af78f7bad9 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig | |||
@@ -157,6 +157,7 @@ CONFIG_IP_SET_BITMAP_IP=m | |||
157 | CONFIG_IP_SET_BITMAP_IPMAC=m | 157 | CONFIG_IP_SET_BITMAP_IPMAC=m |
158 | CONFIG_IP_SET_BITMAP_PORT=m | 158 | CONFIG_IP_SET_BITMAP_PORT=m |
159 | CONFIG_IP_SET_HASH_IP=m | 159 | CONFIG_IP_SET_HASH_IP=m |
160 | CONFIG_IP_SET_HASH_IPMARK=m | ||
160 | CONFIG_IP_SET_HASH_IPPORT=m | 161 | CONFIG_IP_SET_HASH_IPPORT=m |
161 | CONFIG_IP_SET_HASH_IPPORTIP=m | 162 | CONFIG_IP_SET_HASH_IPPORTIP=m |
162 | CONFIG_IP_SET_HASH_IPPORTNET=m | 163 | CONFIG_IP_SET_HASH_IPPORTNET=m |
@@ -225,6 +226,7 @@ CONFIG_DNS_RESOLVER=y | |||
225 | CONFIG_BATMAN_ADV=m | 226 | CONFIG_BATMAN_ADV=m |
226 | CONFIG_BATMAN_ADV_DAT=y | 227 | CONFIG_BATMAN_ADV_DAT=y |
227 | CONFIG_BATMAN_ADV_NC=y | 228 | CONFIG_BATMAN_ADV_NC=y |
229 | CONFIG_BATMAN_ADV_MCAST=y | ||
228 | CONFIG_NETLINK_DIAG=m | 230 | CONFIG_NETLINK_DIAG=m |
229 | CONFIG_NET_MPLS_GSO=m | 231 | CONFIG_NET_MPLS_GSO=m |
230 | # CONFIG_WIRELESS is not set | 232 | # CONFIG_WIRELESS is not set |
@@ -261,6 +263,7 @@ CONFIG_DM_CRYPT=m | |||
261 | CONFIG_DM_SNAPSHOT=m | 263 | CONFIG_DM_SNAPSHOT=m |
262 | CONFIG_DM_THIN_PROVISIONING=m | 264 | CONFIG_DM_THIN_PROVISIONING=m |
263 | CONFIG_DM_CACHE=m | 265 | CONFIG_DM_CACHE=m |
266 | CONFIG_DM_ERA=m | ||
264 | CONFIG_DM_MIRROR=m | 267 | CONFIG_DM_MIRROR=m |
265 | CONFIG_DM_RAID=m | 268 | CONFIG_DM_RAID=m |
266 | CONFIG_DM_ZERO=m | 269 | CONFIG_DM_ZERO=m |
@@ -285,12 +288,12 @@ CONFIG_NETCONSOLE_DYNAMIC=y | |||
285 | CONFIG_VETH=m | 288 | CONFIG_VETH=m |
286 | CONFIG_HPLANCE=y | 289 | CONFIG_HPLANCE=y |
287 | # CONFIG_NET_VENDOR_ARC is not set | 290 | # CONFIG_NET_VENDOR_ARC is not set |
288 | # CONFIG_NET_CADENCE is not set | ||
289 | # CONFIG_NET_VENDOR_BROADCOM is not set | 291 | # CONFIG_NET_VENDOR_BROADCOM is not set |
290 | # CONFIG_NET_VENDOR_INTEL is not set | 292 | # CONFIG_NET_VENDOR_INTEL is not set |
291 | # CONFIG_NET_VENDOR_MARVELL is not set | 293 | # CONFIG_NET_VENDOR_MARVELL is not set |
292 | # CONFIG_NET_VENDOR_MICREL is not set | 294 | # CONFIG_NET_VENDOR_MICREL is not set |
293 | # CONFIG_NET_VENDOR_NATSEMI is not set | 295 | # CONFIG_NET_VENDOR_NATSEMI is not set |
296 | # CONFIG_NET_VENDOR_SAMSUNG is not set | ||
294 | # CONFIG_NET_VENDOR_SEEQ is not set | 297 | # CONFIG_NET_VENDOR_SEEQ is not set |
295 | # CONFIG_NET_VENDOR_STMICRO is not set | 298 | # CONFIG_NET_VENDOR_STMICRO is not set |
296 | # CONFIG_NET_VENDOR_VIA is not set | 299 | # CONFIG_NET_VENDOR_VIA is not set |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index be5342cca25b..66f915574a85 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
@@ -156,6 +156,7 @@ CONFIG_IP_SET_BITMAP_IP=m | |||
156 | CONFIG_IP_SET_BITMAP_IPMAC=m | 156 | CONFIG_IP_SET_BITMAP_IPMAC=m |
157 | CONFIG_IP_SET_BITMAP_PORT=m | 157 | CONFIG_IP_SET_BITMAP_PORT=m |
158 | CONFIG_IP_SET_HASH_IP=m | 158 | CONFIG_IP_SET_HASH_IP=m |
159 | CONFIG_IP_SET_HASH_IPMARK=m | ||
159 | CONFIG_IP_SET_HASH_IPPORT=m | 160 | CONFIG_IP_SET_HASH_IPPORT=m |
160 | CONFIG_IP_SET_HASH_IPPORTIP=m | 161 | CONFIG_IP_SET_HASH_IPPORTIP=m |
161 | CONFIG_IP_SET_HASH_IPPORTNET=m | 162 | CONFIG_IP_SET_HASH_IPPORTNET=m |
@@ -227,6 +228,7 @@ CONFIG_DNS_RESOLVER=y | |||
227 | CONFIG_BATMAN_ADV=m | 228 | CONFIG_BATMAN_ADV=m |
228 | CONFIG_BATMAN_ADV_DAT=y | 229 | CONFIG_BATMAN_ADV_DAT=y |
229 | CONFIG_BATMAN_ADV_NC=y | 230 | CONFIG_BATMAN_ADV_NC=y |
231 | CONFIG_BATMAN_ADV_MCAST=y | ||
230 | CONFIG_NETLINK_DIAG=m | 232 | CONFIG_NETLINK_DIAG=m |
231 | CONFIG_NET_MPLS_GSO=m | 233 | CONFIG_NET_MPLS_GSO=m |
232 | # CONFIG_WIRELESS is not set | 234 | # CONFIG_WIRELESS is not set |
@@ -270,6 +272,7 @@ CONFIG_DM_CRYPT=m | |||
270 | CONFIG_DM_SNAPSHOT=m | 272 | CONFIG_DM_SNAPSHOT=m |
271 | CONFIG_DM_THIN_PROVISIONING=m | 273 | CONFIG_DM_THIN_PROVISIONING=m |
272 | CONFIG_DM_CACHE=m | 274 | CONFIG_DM_CACHE=m |
275 | CONFIG_DM_ERA=m | ||
273 | CONFIG_DM_MIRROR=m | 276 | CONFIG_DM_MIRROR=m |
274 | CONFIG_DM_RAID=m | 277 | CONFIG_DM_RAID=m |
275 | CONFIG_DM_ZERO=m | 278 | CONFIG_DM_ZERO=m |
@@ -301,7 +304,6 @@ CONFIG_NETCONSOLE_DYNAMIC=y | |||
301 | CONFIG_VETH=m | 304 | CONFIG_VETH=m |
302 | CONFIG_MACMACE=y | 305 | CONFIG_MACMACE=y |
303 | # CONFIG_NET_VENDOR_ARC is not set | 306 | # CONFIG_NET_VENDOR_ARC is not set |
304 | # CONFIG_NET_CADENCE is not set | ||
305 | # CONFIG_NET_VENDOR_BROADCOM is not set | 307 | # CONFIG_NET_VENDOR_BROADCOM is not set |
306 | CONFIG_MAC89x0=y | 308 | CONFIG_MAC89x0=y |
307 | # CONFIG_NET_VENDOR_INTEL is not set | 309 | # CONFIG_NET_VENDOR_INTEL is not set |
@@ -309,6 +311,7 @@ CONFIG_MAC89x0=y | |||
309 | # CONFIG_NET_VENDOR_MICREL is not set | 311 | # CONFIG_NET_VENDOR_MICREL is not set |
310 | CONFIG_MACSONIC=y | 312 | CONFIG_MACSONIC=y |
311 | CONFIG_MAC8390=y | 313 | CONFIG_MAC8390=y |
314 | # CONFIG_NET_VENDOR_SAMSUNG is not set | ||
312 | # CONFIG_NET_VENDOR_SEEQ is not set | 315 | # CONFIG_NET_VENDOR_SEEQ is not set |
313 | # CONFIG_NET_VENDOR_SMSC is not set | 316 | # CONFIG_NET_VENDOR_SMSC is not set |
314 | # CONFIG_NET_VENDOR_STMICRO is not set | 317 | # CONFIG_NET_VENDOR_STMICRO is not set |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index f27194ade167..5eaa49924fa6 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
@@ -165,6 +165,7 @@ CONFIG_IP_SET_BITMAP_IP=m | |||
165 | CONFIG_IP_SET_BITMAP_IPMAC=m | 165 | CONFIG_IP_SET_BITMAP_IPMAC=m |
166 | CONFIG_IP_SET_BITMAP_PORT=m | 166 | CONFIG_IP_SET_BITMAP_PORT=m |
167 | CONFIG_IP_SET_HASH_IP=m | 167 | CONFIG_IP_SET_HASH_IP=m |
168 | CONFIG_IP_SET_HASH_IPMARK=m | ||
168 | CONFIG_IP_SET_HASH_IPPORT=m | 169 | CONFIG_IP_SET_HASH_IPPORT=m |
169 | CONFIG_IP_SET_HASH_IPPORTIP=m | 170 | CONFIG_IP_SET_HASH_IPPORTIP=m |
170 | CONFIG_IP_SET_HASH_IPPORTNET=m | 171 | CONFIG_IP_SET_HASH_IPPORTNET=m |
@@ -236,6 +237,7 @@ CONFIG_DNS_RESOLVER=y | |||
236 | CONFIG_BATMAN_ADV=m | 237 | CONFIG_BATMAN_ADV=m |
237 | CONFIG_BATMAN_ADV_DAT=y | 238 | CONFIG_BATMAN_ADV_DAT=y |
238 | CONFIG_BATMAN_ADV_NC=y | 239 | CONFIG_BATMAN_ADV_NC=y |
240 | CONFIG_BATMAN_ADV_MCAST=y | ||
239 | CONFIG_NETLINK_DIAG=m | 241 | CONFIG_NETLINK_DIAG=m |
240 | CONFIG_NET_MPLS_GSO=m | 242 | CONFIG_NET_MPLS_GSO=m |
241 | # CONFIG_WIRELESS is not set | 243 | # CONFIG_WIRELESS is not set |
@@ -302,6 +304,7 @@ CONFIG_DM_CRYPT=m | |||
302 | CONFIG_DM_SNAPSHOT=m | 304 | CONFIG_DM_SNAPSHOT=m |
303 | CONFIG_DM_THIN_PROVISIONING=m | 305 | CONFIG_DM_THIN_PROVISIONING=m |
304 | CONFIG_DM_CACHE=m | 306 | CONFIG_DM_CACHE=m |
307 | CONFIG_DM_ERA=m | ||
305 | CONFIG_DM_MIRROR=m | 308 | CONFIG_DM_MIRROR=m |
306 | CONFIG_DM_RAID=m | 309 | CONFIG_DM_RAID=m |
307 | CONFIG_DM_ZERO=m | 310 | CONFIG_DM_ZERO=m |
@@ -340,7 +343,6 @@ CONFIG_MVME147_NET=y | |||
340 | CONFIG_SUN3LANCE=y | 343 | CONFIG_SUN3LANCE=y |
341 | CONFIG_MACMACE=y | 344 | CONFIG_MACMACE=y |
342 | # CONFIG_NET_VENDOR_ARC is not set | 345 | # CONFIG_NET_VENDOR_ARC is not set |
343 | # CONFIG_NET_CADENCE is not set | ||
344 | # CONFIG_NET_VENDOR_BROADCOM is not set | 346 | # CONFIG_NET_VENDOR_BROADCOM is not set |
345 | CONFIG_MAC89x0=y | 347 | CONFIG_MAC89x0=y |
346 | # CONFIG_NET_VENDOR_HP is not set | 348 | # CONFIG_NET_VENDOR_HP is not set |
@@ -354,6 +356,7 @@ CONFIG_MAC8390=y | |||
354 | CONFIG_NE2000=m | 356 | CONFIG_NE2000=m |
355 | CONFIG_APNE=y | 357 | CONFIG_APNE=y |
356 | CONFIG_ZORRO8390=y | 358 | CONFIG_ZORRO8390=y |
359 | # CONFIG_NET_VENDOR_SAMSUNG is not set | ||
357 | # CONFIG_NET_VENDOR_SEEQ is not set | 360 | # CONFIG_NET_VENDOR_SEEQ is not set |
358 | # CONFIG_NET_VENDOR_STMICRO is not set | 361 | # CONFIG_NET_VENDOR_STMICRO is not set |
359 | # CONFIG_NET_VENDOR_VIA is not set | 362 | # CONFIG_NET_VENDOR_VIA is not set |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index c3887603c1db..324d0b4d8351 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig | |||
@@ -154,6 +154,7 @@ CONFIG_IP_SET_BITMAP_IP=m | |||
154 | CONFIG_IP_SET_BITMAP_IPMAC=m | 154 | CONFIG_IP_SET_BITMAP_IPMAC=m |
155 | CONFIG_IP_SET_BITMAP_PORT=m | 155 | CONFIG_IP_SET_BITMAP_PORT=m |
156 | CONFIG_IP_SET_HASH_IP=m | 156 | CONFIG_IP_SET_HASH_IP=m |
157 | CONFIG_IP_SET_HASH_IPMARK=m | ||
157 | CONFIG_IP_SET_HASH_IPPORT=m | 158 | CONFIG_IP_SET_HASH_IPPORT=m |
158 | CONFIG_IP_SET_HASH_IPPORTIP=m | 159 | CONFIG_IP_SET_HASH_IPPORTIP=m |
159 | CONFIG_IP_SET_HASH_IPPORTNET=m | 160 | CONFIG_IP_SET_HASH_IPPORTNET=m |
@@ -222,6 +223,7 @@ CONFIG_DNS_RESOLVER=y | |||
222 | CONFIG_BATMAN_ADV=m | 223 | CONFIG_BATMAN_ADV=m |
223 | CONFIG_BATMAN_ADV_DAT=y | 224 | CONFIG_BATMAN_ADV_DAT=y |
224 | CONFIG_BATMAN_ADV_NC=y | 225 | CONFIG_BATMAN_ADV_NC=y |
226 | CONFIG_BATMAN_ADV_MCAST=y | ||
225 | CONFIG_NETLINK_DIAG=m | 227 | CONFIG_NETLINK_DIAG=m |
226 | CONFIG_NET_MPLS_GSO=m | 228 | CONFIG_NET_MPLS_GSO=m |
227 | # CONFIG_WIRELESS is not set | 229 | # CONFIG_WIRELESS is not set |
@@ -259,6 +261,7 @@ CONFIG_DM_CRYPT=m | |||
259 | CONFIG_DM_SNAPSHOT=m | 261 | CONFIG_DM_SNAPSHOT=m |
260 | CONFIG_DM_THIN_PROVISIONING=m | 262 | CONFIG_DM_THIN_PROVISIONING=m |
261 | CONFIG_DM_CACHE=m | 263 | CONFIG_DM_CACHE=m |
264 | CONFIG_DM_ERA=m | ||
262 | CONFIG_DM_MIRROR=m | 265 | CONFIG_DM_MIRROR=m |
263 | CONFIG_DM_RAID=m | 266 | CONFIG_DM_RAID=m |
264 | CONFIG_DM_ZERO=m | 267 | CONFIG_DM_ZERO=m |
@@ -283,12 +286,12 @@ CONFIG_NETCONSOLE_DYNAMIC=y | |||
283 | CONFIG_VETH=m | 286 | CONFIG_VETH=m |
284 | CONFIG_MVME147_NET=y | 287 | CONFIG_MVME147_NET=y |
285 | # CONFIG_NET_VENDOR_ARC is not set | 288 | # CONFIG_NET_VENDOR_ARC is not set |
286 | # CONFIG_NET_CADENCE is not set | ||
287 | # CONFIG_NET_VENDOR_BROADCOM is not set | 289 | # CONFIG_NET_VENDOR_BROADCOM is not set |
288 | # CONFIG_NET_VENDOR_INTEL is not set | 290 | # CONFIG_NET_VENDOR_INTEL is not set |
289 | # CONFIG_NET_VENDOR_MARVELL is not set | 291 | # CONFIG_NET_VENDOR_MARVELL is not set |
290 | # CONFIG_NET_VENDOR_MICREL is not set | 292 | # CONFIG_NET_VENDOR_MICREL is not set |
291 | # CONFIG_NET_VENDOR_NATSEMI is not set | 293 | # CONFIG_NET_VENDOR_NATSEMI is not set |
294 | # CONFIG_NET_VENDOR_SAMSUNG is not set | ||
292 | # CONFIG_NET_VENDOR_SEEQ is not set | 295 | # CONFIG_NET_VENDOR_SEEQ is not set |
293 | # CONFIG_NET_VENDOR_STMICRO is not set | 296 | # CONFIG_NET_VENDOR_STMICRO is not set |
294 | # CONFIG_NET_VENDOR_VIA is not set | 297 | # CONFIG_NET_VENDOR_VIA is not set |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index f7ff784d05ac..f0cb4338952e 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
@@ -155,6 +155,7 @@ CONFIG_IP_SET_BITMAP_IP=m | |||
155 | CONFIG_IP_SET_BITMAP_IPMAC=m | 155 | CONFIG_IP_SET_BITMAP_IPMAC=m |
156 | CONFIG_IP_SET_BITMAP_PORT=m | 156 | CONFIG_IP_SET_BITMAP_PORT=m |
157 | CONFIG_IP_SET_HASH_IP=m | 157 | CONFIG_IP_SET_HASH_IP=m |
158 | CONFIG_IP_SET_HASH_IPMARK=m | ||
158 | CONFIG_IP_SET_HASH_IPPORT=m | 159 | CONFIG_IP_SET_HASH_IPPORT=m |
159 | CONFIG_IP_SET_HASH_IPPORTIP=m | 160 | CONFIG_IP_SET_HASH_IPPORTIP=m |
160 | CONFIG_IP_SET_HASH_IPPORTNET=m | 161 | CONFIG_IP_SET_HASH_IPPORTNET=m |
@@ -223,6 +224,7 @@ CONFIG_DNS_RESOLVER=y | |||
223 | CONFIG_BATMAN_ADV=m | 224 | CONFIG_BATMAN_ADV=m |
224 | CONFIG_BATMAN_ADV_DAT=y | 225 | CONFIG_BATMAN_ADV_DAT=y |
225 | CONFIG_BATMAN_ADV_NC=y | 226 | CONFIG_BATMAN_ADV_NC=y |
227 | CONFIG_BATMAN_ADV_MCAST=y | ||
226 | CONFIG_NETLINK_DIAG=m | 228 | CONFIG_NETLINK_DIAG=m |
227 | CONFIG_NET_MPLS_GSO=m | 229 | CONFIG_NET_MPLS_GSO=m |
228 | # CONFIG_WIRELESS is not set | 230 | # CONFIG_WIRELESS is not set |
@@ -260,6 +262,7 @@ CONFIG_DM_CRYPT=m | |||
260 | CONFIG_DM_SNAPSHOT=m | 262 | CONFIG_DM_SNAPSHOT=m |
261 | CONFIG_DM_THIN_PROVISIONING=m | 263 | CONFIG_DM_THIN_PROVISIONING=m |
262 | CONFIG_DM_CACHE=m | 264 | CONFIG_DM_CACHE=m |
265 | CONFIG_DM_ERA=m | ||
263 | CONFIG_DM_MIRROR=m | 266 | CONFIG_DM_MIRROR=m |
264 | CONFIG_DM_RAID=m | 267 | CONFIG_DM_RAID=m |
265 | CONFIG_DM_ZERO=m | 268 | CONFIG_DM_ZERO=m |
@@ -283,12 +286,12 @@ CONFIG_NETCONSOLE=m | |||
283 | CONFIG_NETCONSOLE_DYNAMIC=y | 286 | CONFIG_NETCONSOLE_DYNAMIC=y |
284 | CONFIG_VETH=m | 287 | CONFIG_VETH=m |
285 | # CONFIG_NET_VENDOR_ARC is not set | 288 | # CONFIG_NET_VENDOR_ARC is not set |
286 | # CONFIG_NET_CADENCE is not set | ||
287 | # CONFIG_NET_VENDOR_BROADCOM is not set | 289 | # CONFIG_NET_VENDOR_BROADCOM is not set |
288 | CONFIG_MVME16x_NET=y | 290 | CONFIG_MVME16x_NET=y |
289 | # CONFIG_NET_VENDOR_MARVELL is not set | 291 | # CONFIG_NET_VENDOR_MARVELL is not set |
290 | # CONFIG_NET_VENDOR_MICREL is not set | 292 | # CONFIG_NET_VENDOR_MICREL is not set |
291 | # CONFIG_NET_VENDOR_NATSEMI is not set | 293 | # CONFIG_NET_VENDOR_NATSEMI is not set |
294 | # CONFIG_NET_VENDOR_SAMSUNG is not set | ||
292 | # CONFIG_NET_VENDOR_SEEQ is not set | 295 | # CONFIG_NET_VENDOR_SEEQ is not set |
293 | # CONFIG_NET_VENDOR_STMICRO is not set | 296 | # CONFIG_NET_VENDOR_STMICRO is not set |
294 | # CONFIG_NET_VENDOR_VIA is not set | 297 | # CONFIG_NET_VENDOR_VIA is not set |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index f0c72ab037be..d6cf0880c463 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig | |||
@@ -155,6 +155,7 @@ CONFIG_IP_SET_BITMAP_IP=m | |||
155 | CONFIG_IP_SET_BITMAP_IPMAC=m | 155 | CONFIG_IP_SET_BITMAP_IPMAC=m |
156 | CONFIG_IP_SET_BITMAP_PORT=m | 156 | CONFIG_IP_SET_BITMAP_PORT=m |
157 | CONFIG_IP_SET_HASH_IP=m | 157 | CONFIG_IP_SET_HASH_IP=m |
158 | CONFIG_IP_SET_HASH_IPMARK=m | ||
158 | CONFIG_IP_SET_HASH_IPPORT=m | 159 | CONFIG_IP_SET_HASH_IPPORT=m |
159 | CONFIG_IP_SET_HASH_IPPORTIP=m | 160 | CONFIG_IP_SET_HASH_IPPORTIP=m |
160 | CONFIG_IP_SET_HASH_IPPORTNET=m | 161 | CONFIG_IP_SET_HASH_IPPORTNET=m |
@@ -223,6 +224,7 @@ CONFIG_DNS_RESOLVER=y | |||
223 | CONFIG_BATMAN_ADV=m | 224 | CONFIG_BATMAN_ADV=m |
224 | CONFIG_BATMAN_ADV_DAT=y | 225 | CONFIG_BATMAN_ADV_DAT=y |
225 | CONFIG_BATMAN_ADV_NC=y | 226 | CONFIG_BATMAN_ADV_NC=y |
227 | CONFIG_BATMAN_ADV_MCAST=y | ||
226 | CONFIG_NETLINK_DIAG=m | 228 | CONFIG_NETLINK_DIAG=m |
227 | CONFIG_NET_MPLS_GSO=m | 229 | CONFIG_NET_MPLS_GSO=m |
228 | # CONFIG_WIRELESS is not set | 230 | # CONFIG_WIRELESS is not set |
@@ -266,6 +268,7 @@ CONFIG_DM_CRYPT=m | |||
266 | CONFIG_DM_SNAPSHOT=m | 268 | CONFIG_DM_SNAPSHOT=m |
267 | CONFIG_DM_THIN_PROVISIONING=m | 269 | CONFIG_DM_THIN_PROVISIONING=m |
268 | CONFIG_DM_CACHE=m | 270 | CONFIG_DM_CACHE=m |
271 | CONFIG_DM_ERA=m | ||
269 | CONFIG_DM_MIRROR=m | 272 | CONFIG_DM_MIRROR=m |
270 | CONFIG_DM_RAID=m | 273 | CONFIG_DM_RAID=m |
271 | CONFIG_DM_ZERO=m | 274 | CONFIG_DM_ZERO=m |
@@ -291,7 +294,6 @@ CONFIG_VETH=m | |||
291 | # CONFIG_NET_VENDOR_3COM is not set | 294 | # CONFIG_NET_VENDOR_3COM is not set |
292 | # CONFIG_NET_VENDOR_AMD is not set | 295 | # CONFIG_NET_VENDOR_AMD is not set |
293 | # CONFIG_NET_VENDOR_ARC is not set | 296 | # CONFIG_NET_VENDOR_ARC is not set |
294 | # CONFIG_NET_CADENCE is not set | ||
295 | # CONFIG_NET_VENDOR_BROADCOM is not set | 297 | # CONFIG_NET_VENDOR_BROADCOM is not set |
296 | # CONFIG_NET_VENDOR_CIRRUS is not set | 298 | # CONFIG_NET_VENDOR_CIRRUS is not set |
297 | # CONFIG_NET_VENDOR_HP is not set | 299 | # CONFIG_NET_VENDOR_HP is not set |
@@ -299,6 +301,7 @@ CONFIG_VETH=m | |||
299 | # CONFIG_NET_VENDOR_MARVELL is not set | 301 | # CONFIG_NET_VENDOR_MARVELL is not set |
300 | # CONFIG_NET_VENDOR_MICREL is not set | 302 | # CONFIG_NET_VENDOR_MICREL is not set |
301 | CONFIG_NE2000=m | 303 | CONFIG_NE2000=m |
304 | # CONFIG_NET_VENDOR_SAMSUNG is not set | ||
302 | # CONFIG_NET_VENDOR_SEEQ is not set | 305 | # CONFIG_NET_VENDOR_SEEQ is not set |
303 | # CONFIG_NET_VENDOR_SMSC is not set | 306 | # CONFIG_NET_VENDOR_SMSC is not set |
304 | # CONFIG_NET_VENDOR_STMICRO is not set | 307 | # CONFIG_NET_VENDOR_STMICRO is not set |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index 7bca0f464521..f4e88d1c7472 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig | |||
@@ -152,6 +152,7 @@ CONFIG_IP_SET_BITMAP_IP=m | |||
152 | CONFIG_IP_SET_BITMAP_IPMAC=m | 152 | CONFIG_IP_SET_BITMAP_IPMAC=m |
153 | CONFIG_IP_SET_BITMAP_PORT=m | 153 | CONFIG_IP_SET_BITMAP_PORT=m |
154 | CONFIG_IP_SET_HASH_IP=m | 154 | CONFIG_IP_SET_HASH_IP=m |
155 | CONFIG_IP_SET_HASH_IPMARK=m | ||
155 | CONFIG_IP_SET_HASH_IPPORT=m | 156 | CONFIG_IP_SET_HASH_IPPORT=m |
156 | CONFIG_IP_SET_HASH_IPPORTIP=m | 157 | CONFIG_IP_SET_HASH_IPPORTIP=m |
157 | CONFIG_IP_SET_HASH_IPPORTNET=m | 158 | CONFIG_IP_SET_HASH_IPPORTNET=m |
@@ -220,6 +221,7 @@ CONFIG_DNS_RESOLVER=y | |||
220 | CONFIG_BATMAN_ADV=m | 221 | CONFIG_BATMAN_ADV=m |
221 | CONFIG_BATMAN_ADV_DAT=y | 222 | CONFIG_BATMAN_ADV_DAT=y |
222 | CONFIG_BATMAN_ADV_NC=y | 223 | CONFIG_BATMAN_ADV_NC=y |
224 | CONFIG_BATMAN_ADV_MCAST=y | ||
223 | CONFIG_NETLINK_DIAG=m | 225 | CONFIG_NETLINK_DIAG=m |
224 | CONFIG_NET_MPLS_GSO=m | 226 | CONFIG_NET_MPLS_GSO=m |
225 | # CONFIG_WIRELESS is not set | 227 | # CONFIG_WIRELESS is not set |
@@ -257,6 +259,7 @@ CONFIG_DM_CRYPT=m | |||
257 | CONFIG_DM_SNAPSHOT=m | 259 | CONFIG_DM_SNAPSHOT=m |
258 | CONFIG_DM_THIN_PROVISIONING=m | 260 | CONFIG_DM_THIN_PROVISIONING=m |
259 | CONFIG_DM_CACHE=m | 261 | CONFIG_DM_CACHE=m |
262 | CONFIG_DM_ERA=m | ||
260 | CONFIG_DM_MIRROR=m | 263 | CONFIG_DM_MIRROR=m |
261 | CONFIG_DM_RAID=m | 264 | CONFIG_DM_RAID=m |
262 | CONFIG_DM_ZERO=m | 265 | CONFIG_DM_ZERO=m |
@@ -281,11 +284,11 @@ CONFIG_NETCONSOLE_DYNAMIC=y | |||
281 | CONFIG_VETH=m | 284 | CONFIG_VETH=m |
282 | CONFIG_SUN3LANCE=y | 285 | CONFIG_SUN3LANCE=y |
283 | # CONFIG_NET_VENDOR_ARC is not set | 286 | # CONFIG_NET_VENDOR_ARC is not set |
284 | # CONFIG_NET_CADENCE is not set | ||
285 | CONFIG_SUN3_82586=y | 287 | CONFIG_SUN3_82586=y |
286 | # CONFIG_NET_VENDOR_MARVELL is not set | 288 | # CONFIG_NET_VENDOR_MARVELL is not set |
287 | # CONFIG_NET_VENDOR_MICREL is not set | 289 | # CONFIG_NET_VENDOR_MICREL is not set |
288 | # CONFIG_NET_VENDOR_NATSEMI is not set | 290 | # CONFIG_NET_VENDOR_NATSEMI is not set |
291 | # CONFIG_NET_VENDOR_SAMSUNG is not set | ||
289 | # CONFIG_NET_VENDOR_SEEQ is not set | 292 | # CONFIG_NET_VENDOR_SEEQ is not set |
290 | # CONFIG_NET_VENDOR_STMICRO is not set | 293 | # CONFIG_NET_VENDOR_STMICRO is not set |
291 | # CONFIG_NET_VENDOR_SUN is not set | 294 | # CONFIG_NET_VENDOR_SUN is not set |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 317f3e1fec95..49f4032c1ad6 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
@@ -152,6 +152,7 @@ CONFIG_IP_SET_BITMAP_IP=m | |||
152 | CONFIG_IP_SET_BITMAP_IPMAC=m | 152 | CONFIG_IP_SET_BITMAP_IPMAC=m |
153 | CONFIG_IP_SET_BITMAP_PORT=m | 153 | CONFIG_IP_SET_BITMAP_PORT=m |
154 | CONFIG_IP_SET_HASH_IP=m | 154 | CONFIG_IP_SET_HASH_IP=m |
155 | CONFIG_IP_SET_HASH_IPMARK=m | ||
155 | CONFIG_IP_SET_HASH_IPPORT=m | 156 | CONFIG_IP_SET_HASH_IPPORT=m |
156 | CONFIG_IP_SET_HASH_IPPORTIP=m | 157 | CONFIG_IP_SET_HASH_IPPORTIP=m |
157 | CONFIG_IP_SET_HASH_IPPORTNET=m | 158 | CONFIG_IP_SET_HASH_IPPORTNET=m |
@@ -220,6 +221,7 @@ CONFIG_DNS_RESOLVER=y | |||
220 | CONFIG_BATMAN_ADV=m | 221 | CONFIG_BATMAN_ADV=m |
221 | CONFIG_BATMAN_ADV_DAT=y | 222 | CONFIG_BATMAN_ADV_DAT=y |
222 | CONFIG_BATMAN_ADV_NC=y | 223 | CONFIG_BATMAN_ADV_NC=y |
224 | CONFIG_BATMAN_ADV_MCAST=y | ||
223 | CONFIG_NETLINK_DIAG=m | 225 | CONFIG_NETLINK_DIAG=m |
224 | CONFIG_NET_MPLS_GSO=m | 226 | CONFIG_NET_MPLS_GSO=m |
225 | # CONFIG_WIRELESS is not set | 227 | # CONFIG_WIRELESS is not set |
@@ -257,6 +259,7 @@ CONFIG_DM_CRYPT=m | |||
257 | CONFIG_DM_SNAPSHOT=m | 259 | CONFIG_DM_SNAPSHOT=m |
258 | CONFIG_DM_THIN_PROVISIONING=m | 260 | CONFIG_DM_THIN_PROVISIONING=m |
259 | CONFIG_DM_CACHE=m | 261 | CONFIG_DM_CACHE=m |
262 | CONFIG_DM_ERA=m | ||
260 | CONFIG_DM_MIRROR=m | 263 | CONFIG_DM_MIRROR=m |
261 | CONFIG_DM_RAID=m | 264 | CONFIG_DM_RAID=m |
262 | CONFIG_DM_ZERO=m | 265 | CONFIG_DM_ZERO=m |
@@ -281,12 +284,12 @@ CONFIG_NETCONSOLE_DYNAMIC=y | |||
281 | CONFIG_VETH=m | 284 | CONFIG_VETH=m |
282 | CONFIG_SUN3LANCE=y | 285 | CONFIG_SUN3LANCE=y |
283 | # CONFIG_NET_VENDOR_ARC is not set | 286 | # CONFIG_NET_VENDOR_ARC is not set |
284 | # CONFIG_NET_CADENCE is not set | ||
285 | # CONFIG_NET_VENDOR_BROADCOM is not set | 287 | # CONFIG_NET_VENDOR_BROADCOM is not set |
286 | # CONFIG_NET_VENDOR_INTEL is not set | 288 | # CONFIG_NET_VENDOR_INTEL is not set |
287 | # CONFIG_NET_VENDOR_MARVELL is not set | 289 | # CONFIG_NET_VENDOR_MARVELL is not set |
288 | # CONFIG_NET_VENDOR_MICREL is not set | 290 | # CONFIG_NET_VENDOR_MICREL is not set |
289 | # CONFIG_NET_VENDOR_NATSEMI is not set | 291 | # CONFIG_NET_VENDOR_NATSEMI is not set |
292 | # CONFIG_NET_VENDOR_SAMSUNG is not set | ||
290 | # CONFIG_NET_VENDOR_SEEQ is not set | 293 | # CONFIG_NET_VENDOR_SEEQ is not set |
291 | # CONFIG_NET_VENDOR_STMICRO is not set | 294 | # CONFIG_NET_VENDOR_STMICRO is not set |
292 | # CONFIG_NET_VENDOR_VIA is not set | 295 | # CONFIG_NET_VENDOR_VIA is not set |