aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2016-10-17 03:19:12 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2016-10-30 05:13:19 -0400
commit955fe2aaed3ab64914f1a21209d8b0a5b9e920ae (patch)
tree3d2d5c172f2dd23432859d19bcb7eb3bc3eb5a26 /arch/m68k
parent1001354ca34179f3db924eb66672442a173147dc (diff)
m68k/defconfig: Update defconfigs for v4.9-rc1
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/configs/amiga_defconfig8
-rw-r--r--arch/m68k/configs/apollo_defconfig8
-rw-r--r--arch/m68k/configs/atari_defconfig8
-rw-r--r--arch/m68k/configs/bvme6000_defconfig8
-rw-r--r--arch/m68k/configs/hp300_defconfig8
-rw-r--r--arch/m68k/configs/mac_defconfig8
-rw-r--r--arch/m68k/configs/multi_defconfig8
-rw-r--r--arch/m68k/configs/mvme147_defconfig8
-rw-r--r--arch/m68k/configs/mvme16x_defconfig8
-rw-r--r--arch/m68k/configs/q40_defconfig8
-rw-r--r--arch/m68k/configs/sun3_defconfig8
-rw-r--r--arch/m68k/configs/sun3x_defconfig8
12 files changed, 72 insertions, 24 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 55be7e3ff109..b98acd15ca22 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -95,9 +95,10 @@ CONFIG_NF_TABLES_INET=m
95CONFIG_NF_TABLES_NETDEV=m 95CONFIG_NF_TABLES_NETDEV=m
96CONFIG_NFT_EXTHDR=m 96CONFIG_NFT_EXTHDR=m
97CONFIG_NFT_META=m 97CONFIG_NFT_META=m
98CONFIG_NFT_NUMGEN=m
98CONFIG_NFT_CT=m 99CONFIG_NFT_CT=m
99CONFIG_NFT_RBTREE=m 100CONFIG_NFT_SET_RBTREE=m
100CONFIG_NFT_HASH=m 101CONFIG_NFT_SET_HASH=m
101CONFIG_NFT_COUNTER=m 102CONFIG_NFT_COUNTER=m
102CONFIG_NFT_LOG=m 103CONFIG_NFT_LOG=m
103CONFIG_NFT_LIMIT=m 104CONFIG_NFT_LIMIT=m
@@ -105,8 +106,10 @@ CONFIG_NFT_MASQ=m
105CONFIG_NFT_REDIR=m 106CONFIG_NFT_REDIR=m
106CONFIG_NFT_NAT=m 107CONFIG_NFT_NAT=m
107CONFIG_NFT_QUEUE=m 108CONFIG_NFT_QUEUE=m
109CONFIG_NFT_QUOTA=m
108CONFIG_NFT_REJECT=m 110CONFIG_NFT_REJECT=m
109CONFIG_NFT_COMPAT=m 111CONFIG_NFT_COMPAT=m
112CONFIG_NFT_HASH=m
110CONFIG_NFT_DUP_NETDEV=m 113CONFIG_NFT_DUP_NETDEV=m
111CONFIG_NFT_FWD_NETDEV=m 114CONFIG_NFT_FWD_NETDEV=m
112CONFIG_NETFILTER_XT_SET=m 115CONFIG_NETFILTER_XT_SET=m
@@ -366,6 +369,7 @@ CONFIG_NETCONSOLE=m
366CONFIG_NETCONSOLE_DYNAMIC=y 369CONFIG_NETCONSOLE_DYNAMIC=y
367CONFIG_VETH=m 370CONFIG_VETH=m
368# CONFIG_NET_VENDOR_3COM is not set 371# CONFIG_NET_VENDOR_3COM is not set
372# CONFIG_NET_VENDOR_AMAZON is not set
369CONFIG_A2065=y 373CONFIG_A2065=y
370CONFIG_ARIADNE=y 374CONFIG_ARIADNE=y
371# CONFIG_NET_VENDOR_ARC is not set 375# CONFIG_NET_VENDOR_ARC is not set
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 365dda66b0e6..f80dc57e6374 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -93,9 +93,10 @@ CONFIG_NF_TABLES_INET=m
93CONFIG_NF_TABLES_NETDEV=m 93CONFIG_NF_TABLES_NETDEV=m
94CONFIG_NFT_EXTHDR=m 94CONFIG_NFT_EXTHDR=m
95CONFIG_NFT_META=m 95CONFIG_NFT_META=m
96CONFIG_NFT_NUMGEN=m
96CONFIG_NFT_CT=m 97CONFIG_NFT_CT=m
97CONFIG_NFT_RBTREE=m 98CONFIG_NFT_SET_RBTREE=m
98CONFIG_NFT_HASH=m 99CONFIG_NFT_SET_HASH=m
99CONFIG_NFT_COUNTER=m 100CONFIG_NFT_COUNTER=m
100CONFIG_NFT_LOG=m 101CONFIG_NFT_LOG=m
101CONFIG_NFT_LIMIT=m 102CONFIG_NFT_LIMIT=m
@@ -103,8 +104,10 @@ CONFIG_NFT_MASQ=m
103CONFIG_NFT_REDIR=m 104CONFIG_NFT_REDIR=m
104CONFIG_NFT_NAT=m 105CONFIG_NFT_NAT=m
105CONFIG_NFT_QUEUE=m 106CONFIG_NFT_QUEUE=m
107CONFIG_NFT_QUOTA=m
106CONFIG_NFT_REJECT=m 108CONFIG_NFT_REJECT=m
107CONFIG_NFT_COMPAT=m 109CONFIG_NFT_COMPAT=m
110CONFIG_NFT_HASH=m
108CONFIG_NFT_DUP_NETDEV=m 111CONFIG_NFT_DUP_NETDEV=m
109CONFIG_NFT_FWD_NETDEV=m 112CONFIG_NFT_FWD_NETDEV=m
110CONFIG_NETFILTER_XT_SET=m 113CONFIG_NETFILTER_XT_SET=m
@@ -347,6 +350,7 @@ CONFIG_MACSEC=m
347CONFIG_NETCONSOLE=m 350CONFIG_NETCONSOLE=m
348CONFIG_NETCONSOLE_DYNAMIC=y 351CONFIG_NETCONSOLE_DYNAMIC=y
349CONFIG_VETH=m 352CONFIG_VETH=m
353# CONFIG_NET_VENDOR_AMAZON is not set
350# CONFIG_NET_VENDOR_ARC is not set 354# CONFIG_NET_VENDOR_ARC is not set
351# CONFIG_NET_CADENCE is not set 355# CONFIG_NET_CADENCE is not set
352# CONFIG_NET_VENDOR_BROADCOM is not set 356# CONFIG_NET_VENDOR_BROADCOM is not set
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index ce3cbfd16fcd..4e16b1821fbb 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -93,9 +93,10 @@ CONFIG_NF_TABLES_INET=m
93CONFIG_NF_TABLES_NETDEV=m 93CONFIG_NF_TABLES_NETDEV=m
94CONFIG_NFT_EXTHDR=m 94CONFIG_NFT_EXTHDR=m
95CONFIG_NFT_META=m 95CONFIG_NFT_META=m
96CONFIG_NFT_NUMGEN=m
96CONFIG_NFT_CT=m 97CONFIG_NFT_CT=m
97CONFIG_NFT_RBTREE=m 98CONFIG_NFT_SET_RBTREE=m
98CONFIG_NFT_HASH=m 99CONFIG_NFT_SET_HASH=m
99CONFIG_NFT_COUNTER=m 100CONFIG_NFT_COUNTER=m
100CONFIG_NFT_LOG=m 101CONFIG_NFT_LOG=m
101CONFIG_NFT_LIMIT=m 102CONFIG_NFT_LIMIT=m
@@ -103,8 +104,10 @@ CONFIG_NFT_MASQ=m
103CONFIG_NFT_REDIR=m 104CONFIG_NFT_REDIR=m
104CONFIG_NFT_NAT=m 105CONFIG_NFT_NAT=m
105CONFIG_NFT_QUEUE=m 106CONFIG_NFT_QUEUE=m
107CONFIG_NFT_QUOTA=m
106CONFIG_NFT_REJECT=m 108CONFIG_NFT_REJECT=m
107CONFIG_NFT_COMPAT=m 109CONFIG_NFT_COMPAT=m
110CONFIG_NFT_HASH=m
108CONFIG_NFT_DUP_NETDEV=m 111CONFIG_NFT_DUP_NETDEV=m
109CONFIG_NFT_FWD_NETDEV=m 112CONFIG_NFT_FWD_NETDEV=m
110CONFIG_NETFILTER_XT_SET=m 113CONFIG_NETFILTER_XT_SET=m
@@ -356,6 +359,7 @@ CONFIG_MACSEC=m
356CONFIG_NETCONSOLE=m 359CONFIG_NETCONSOLE=m
357CONFIG_NETCONSOLE_DYNAMIC=y 360CONFIG_NETCONSOLE_DYNAMIC=y
358CONFIG_VETH=m 361CONFIG_VETH=m
362# CONFIG_NET_VENDOR_AMAZON is not set
359CONFIG_ATARILANCE=y 363CONFIG_ATARILANCE=y
360# CONFIG_NET_VENDOR_ARC is not set 364# CONFIG_NET_VENDOR_ARC is not set
361# CONFIG_NET_CADENCE is not set 365# CONFIG_NET_CADENCE is not set
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 8db496a9797d..2767bbf5ad61 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -91,9 +91,10 @@ CONFIG_NF_TABLES_INET=m
91CONFIG_NF_TABLES_NETDEV=m 91CONFIG_NF_TABLES_NETDEV=m
92CONFIG_NFT_EXTHDR=m 92CONFIG_NFT_EXTHDR=m
93CONFIG_NFT_META=m 93CONFIG_NFT_META=m
94CONFIG_NFT_NUMGEN=m
94CONFIG_NFT_CT=m 95CONFIG_NFT_CT=m
95CONFIG_NFT_RBTREE=m 96CONFIG_NFT_SET_RBTREE=m
96CONFIG_NFT_HASH=m 97CONFIG_NFT_SET_HASH=m
97CONFIG_NFT_COUNTER=m 98CONFIG_NFT_COUNTER=m
98CONFIG_NFT_LOG=m 99CONFIG_NFT_LOG=m
99CONFIG_NFT_LIMIT=m 100CONFIG_NFT_LIMIT=m
@@ -101,8 +102,10 @@ CONFIG_NFT_MASQ=m
101CONFIG_NFT_REDIR=m 102CONFIG_NFT_REDIR=m
102CONFIG_NFT_NAT=m 103CONFIG_NFT_NAT=m
103CONFIG_NFT_QUEUE=m 104CONFIG_NFT_QUEUE=m
105CONFIG_NFT_QUOTA=m
104CONFIG_NFT_REJECT=m 106CONFIG_NFT_REJECT=m
105CONFIG_NFT_COMPAT=m 107CONFIG_NFT_COMPAT=m
108CONFIG_NFT_HASH=m
106CONFIG_NFT_DUP_NETDEV=m 109CONFIG_NFT_DUP_NETDEV=m
107CONFIG_NFT_FWD_NETDEV=m 110CONFIG_NFT_FWD_NETDEV=m
108CONFIG_NETFILTER_XT_SET=m 111CONFIG_NETFILTER_XT_SET=m
@@ -346,6 +349,7 @@ CONFIG_MACSEC=m
346CONFIG_NETCONSOLE=m 349CONFIG_NETCONSOLE=m
347CONFIG_NETCONSOLE_DYNAMIC=y 350CONFIG_NETCONSOLE_DYNAMIC=y
348CONFIG_VETH=m 351CONFIG_VETH=m
352# CONFIG_NET_VENDOR_AMAZON is not set
349# CONFIG_NET_VENDOR_ARC is not set 353# CONFIG_NET_VENDOR_ARC is not set
350# CONFIG_NET_CADENCE is not set 354# CONFIG_NET_CADENCE is not set
351# CONFIG_NET_VENDOR_BROADCOM is not set 355# CONFIG_NET_VENDOR_BROADCOM is not set
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 8314156f7149..d13ba309265e 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -93,9 +93,10 @@ CONFIG_NF_TABLES_INET=m
93CONFIG_NF_TABLES_NETDEV=m 93CONFIG_NF_TABLES_NETDEV=m
94CONFIG_NFT_EXTHDR=m 94CONFIG_NFT_EXTHDR=m
95CONFIG_NFT_META=m 95CONFIG_NFT_META=m
96CONFIG_NFT_NUMGEN=m
96CONFIG_NFT_CT=m 97CONFIG_NFT_CT=m
97CONFIG_NFT_RBTREE=m 98CONFIG_NFT_SET_RBTREE=m
98CONFIG_NFT_HASH=m 99CONFIG_NFT_SET_HASH=m
99CONFIG_NFT_COUNTER=m 100CONFIG_NFT_COUNTER=m
100CONFIG_NFT_LOG=m 101CONFIG_NFT_LOG=m
101CONFIG_NFT_LIMIT=m 102CONFIG_NFT_LIMIT=m
@@ -103,8 +104,10 @@ CONFIG_NFT_MASQ=m
103CONFIG_NFT_REDIR=m 104CONFIG_NFT_REDIR=m
104CONFIG_NFT_NAT=m 105CONFIG_NFT_NAT=m
105CONFIG_NFT_QUEUE=m 106CONFIG_NFT_QUEUE=m
107CONFIG_NFT_QUOTA=m
106CONFIG_NFT_REJECT=m 108CONFIG_NFT_REJECT=m
107CONFIG_NFT_COMPAT=m 109CONFIG_NFT_COMPAT=m
110CONFIG_NFT_HASH=m
108CONFIG_NFT_DUP_NETDEV=m 111CONFIG_NFT_DUP_NETDEV=m
109CONFIG_NFT_FWD_NETDEV=m 112CONFIG_NFT_FWD_NETDEV=m
110CONFIG_NETFILTER_XT_SET=m 113CONFIG_NETFILTER_XT_SET=m
@@ -347,6 +350,7 @@ CONFIG_MACSEC=m
347CONFIG_NETCONSOLE=m 350CONFIG_NETCONSOLE=m
348CONFIG_NETCONSOLE_DYNAMIC=y 351CONFIG_NETCONSOLE_DYNAMIC=y
349CONFIG_VETH=m 352CONFIG_VETH=m
353# CONFIG_NET_VENDOR_AMAZON is not set
350CONFIG_HPLANCE=y 354CONFIG_HPLANCE=y
351# CONFIG_NET_VENDOR_ARC is not set 355# CONFIG_NET_VENDOR_ARC is not set
352# CONFIG_NET_CADENCE is not set 356# CONFIG_NET_CADENCE is not set
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 6600270b9622..78b5101c1aa6 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -92,9 +92,10 @@ CONFIG_NF_TABLES_INET=m
92CONFIG_NF_TABLES_NETDEV=m 92CONFIG_NF_TABLES_NETDEV=m
93CONFIG_NFT_EXTHDR=m 93CONFIG_NFT_EXTHDR=m
94CONFIG_NFT_META=m 94CONFIG_NFT_META=m
95CONFIG_NFT_NUMGEN=m
95CONFIG_NFT_CT=m 96CONFIG_NFT_CT=m
96CONFIG_NFT_RBTREE=m 97CONFIG_NFT_SET_RBTREE=m
97CONFIG_NFT_HASH=m 98CONFIG_NFT_SET_HASH=m
98CONFIG_NFT_COUNTER=m 99CONFIG_NFT_COUNTER=m
99CONFIG_NFT_LOG=m 100CONFIG_NFT_LOG=m
100CONFIG_NFT_LIMIT=m 101CONFIG_NFT_LIMIT=m
@@ -102,8 +103,10 @@ CONFIG_NFT_MASQ=m
102CONFIG_NFT_REDIR=m 103CONFIG_NFT_REDIR=m
103CONFIG_NFT_NAT=m 104CONFIG_NFT_NAT=m
104CONFIG_NFT_QUEUE=m 105CONFIG_NFT_QUEUE=m
106CONFIG_NFT_QUOTA=m
105CONFIG_NFT_REJECT=m 107CONFIG_NFT_REJECT=m
106CONFIG_NFT_COMPAT=m 108CONFIG_NFT_COMPAT=m
109CONFIG_NFT_HASH=m
107CONFIG_NFT_DUP_NETDEV=m 110CONFIG_NFT_DUP_NETDEV=m
108CONFIG_NFT_FWD_NETDEV=m 111CONFIG_NFT_FWD_NETDEV=m
109CONFIG_NETFILTER_XT_SET=m 112CONFIG_NETFILTER_XT_SET=m
@@ -363,6 +366,7 @@ CONFIG_MACSEC=m
363CONFIG_NETCONSOLE=m 366CONFIG_NETCONSOLE=m
364CONFIG_NETCONSOLE_DYNAMIC=y 367CONFIG_NETCONSOLE_DYNAMIC=y
365CONFIG_VETH=m 368CONFIG_VETH=m
369# CONFIG_NET_VENDOR_AMAZON is not set
366CONFIG_MACMACE=y 370CONFIG_MACMACE=y
367# CONFIG_NET_VENDOR_ARC is not set 371# CONFIG_NET_VENDOR_ARC is not set
368# CONFIG_NET_CADENCE is not set 372# CONFIG_NET_CADENCE is not set
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 90abfe9eabba..38e5bcbd0d62 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -102,9 +102,10 @@ CONFIG_NF_TABLES_INET=m
102CONFIG_NF_TABLES_NETDEV=m 102CONFIG_NF_TABLES_NETDEV=m
103CONFIG_NFT_EXTHDR=m 103CONFIG_NFT_EXTHDR=m
104CONFIG_NFT_META=m 104CONFIG_NFT_META=m
105CONFIG_NFT_NUMGEN=m
105CONFIG_NFT_CT=m 106CONFIG_NFT_CT=m
106CONFIG_NFT_RBTREE=m 107CONFIG_NFT_SET_RBTREE=m
107CONFIG_NFT_HASH=m 108CONFIG_NFT_SET_HASH=m
108CONFIG_NFT_COUNTER=m 109CONFIG_NFT_COUNTER=m
109CONFIG_NFT_LOG=m 110CONFIG_NFT_LOG=m
110CONFIG_NFT_LIMIT=m 111CONFIG_NFT_LIMIT=m
@@ -112,8 +113,10 @@ CONFIG_NFT_MASQ=m
112CONFIG_NFT_REDIR=m 113CONFIG_NFT_REDIR=m
113CONFIG_NFT_NAT=m 114CONFIG_NFT_NAT=m
114CONFIG_NFT_QUEUE=m 115CONFIG_NFT_QUEUE=m
116CONFIG_NFT_QUOTA=m
115CONFIG_NFT_REJECT=m 117CONFIG_NFT_REJECT=m
116CONFIG_NFT_COMPAT=m 118CONFIG_NFT_COMPAT=m
119CONFIG_NFT_HASH=m
117CONFIG_NFT_DUP_NETDEV=m 120CONFIG_NFT_DUP_NETDEV=m
118CONFIG_NFT_FWD_NETDEV=m 121CONFIG_NFT_FWD_NETDEV=m
119CONFIG_NETFILTER_XT_SET=m 122CONFIG_NETFILTER_XT_SET=m
@@ -397,6 +400,7 @@ CONFIG_NETCONSOLE=m
397CONFIG_NETCONSOLE_DYNAMIC=y 400CONFIG_NETCONSOLE_DYNAMIC=y
398CONFIG_VETH=m 401CONFIG_VETH=m
399# CONFIG_NET_VENDOR_3COM is not set 402# CONFIG_NET_VENDOR_3COM is not set
403# CONFIG_NET_VENDOR_AMAZON is not set
400CONFIG_A2065=y 404CONFIG_A2065=y
401CONFIG_ARIADNE=y 405CONFIG_ARIADNE=y
402CONFIG_ATARILANCE=y 406CONFIG_ATARILANCE=y
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 0d502c2f73d5..28687192b68e 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -90,9 +90,10 @@ CONFIG_NF_TABLES_INET=m
90CONFIG_NF_TABLES_NETDEV=m 90CONFIG_NF_TABLES_NETDEV=m
91CONFIG_NFT_EXTHDR=m 91CONFIG_NFT_EXTHDR=m
92CONFIG_NFT_META=m 92CONFIG_NFT_META=m
93CONFIG_NFT_NUMGEN=m
93CONFIG_NFT_CT=m 94CONFIG_NFT_CT=m
94CONFIG_NFT_RBTREE=m 95CONFIG_NFT_SET_RBTREE=m
95CONFIG_NFT_HASH=m 96CONFIG_NFT_SET_HASH=m
96CONFIG_NFT_COUNTER=m 97CONFIG_NFT_COUNTER=m
97CONFIG_NFT_LOG=m 98CONFIG_NFT_LOG=m
98CONFIG_NFT_LIMIT=m 99CONFIG_NFT_LIMIT=m
@@ -100,8 +101,10 @@ CONFIG_NFT_MASQ=m
100CONFIG_NFT_REDIR=m 101CONFIG_NFT_REDIR=m
101CONFIG_NFT_NAT=m 102CONFIG_NFT_NAT=m
102CONFIG_NFT_QUEUE=m 103CONFIG_NFT_QUEUE=m
104CONFIG_NFT_QUOTA=m
103CONFIG_NFT_REJECT=m 105CONFIG_NFT_REJECT=m
104CONFIG_NFT_COMPAT=m 106CONFIG_NFT_COMPAT=m
107CONFIG_NFT_HASH=m
105CONFIG_NFT_DUP_NETDEV=m 108CONFIG_NFT_DUP_NETDEV=m
106CONFIG_NFT_FWD_NETDEV=m 109CONFIG_NFT_FWD_NETDEV=m
107CONFIG_NETFILTER_XT_SET=m 110CONFIG_NETFILTER_XT_SET=m
@@ -345,6 +348,7 @@ CONFIG_MACSEC=m
345CONFIG_NETCONSOLE=m 348CONFIG_NETCONSOLE=m
346CONFIG_NETCONSOLE_DYNAMIC=y 349CONFIG_NETCONSOLE_DYNAMIC=y
347CONFIG_VETH=m 350CONFIG_VETH=m
351# CONFIG_NET_VENDOR_AMAZON is not set
348CONFIG_MVME147_NET=y 352CONFIG_MVME147_NET=y
349# CONFIG_NET_VENDOR_ARC is not set 353# CONFIG_NET_VENDOR_ARC is not set
350# CONFIG_NET_CADENCE is not set 354# CONFIG_NET_CADENCE is not set
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 5930e91fc710..5a5f109ab3cd 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -91,9 +91,10 @@ CONFIG_NF_TABLES_INET=m
91CONFIG_NF_TABLES_NETDEV=m 91CONFIG_NF_TABLES_NETDEV=m
92CONFIG_NFT_EXTHDR=m 92CONFIG_NFT_EXTHDR=m
93CONFIG_NFT_META=m 93CONFIG_NFT_META=m
94CONFIG_NFT_NUMGEN=m
94CONFIG_NFT_CT=m 95CONFIG_NFT_CT=m
95CONFIG_NFT_RBTREE=m 96CONFIG_NFT_SET_RBTREE=m
96CONFIG_NFT_HASH=m 97CONFIG_NFT_SET_HASH=m
97CONFIG_NFT_COUNTER=m 98CONFIG_NFT_COUNTER=m
98CONFIG_NFT_LOG=m 99CONFIG_NFT_LOG=m
99CONFIG_NFT_LIMIT=m 100CONFIG_NFT_LIMIT=m
@@ -101,8 +102,10 @@ CONFIG_NFT_MASQ=m
101CONFIG_NFT_REDIR=m 102CONFIG_NFT_REDIR=m
102CONFIG_NFT_NAT=m 103CONFIG_NFT_NAT=m
103CONFIG_NFT_QUEUE=m 104CONFIG_NFT_QUEUE=m
105CONFIG_NFT_QUOTA=m
104CONFIG_NFT_REJECT=m 106CONFIG_NFT_REJECT=m
105CONFIG_NFT_COMPAT=m 107CONFIG_NFT_COMPAT=m
108CONFIG_NFT_HASH=m
106CONFIG_NFT_DUP_NETDEV=m 109CONFIG_NFT_DUP_NETDEV=m
107CONFIG_NFT_FWD_NETDEV=m 110CONFIG_NFT_FWD_NETDEV=m
108CONFIG_NETFILTER_XT_SET=m 111CONFIG_NETFILTER_XT_SET=m
@@ -346,6 +349,7 @@ CONFIG_MACSEC=m
346CONFIG_NETCONSOLE=m 349CONFIG_NETCONSOLE=m
347CONFIG_NETCONSOLE_DYNAMIC=y 350CONFIG_NETCONSOLE_DYNAMIC=y
348CONFIG_VETH=m 351CONFIG_VETH=m
352# CONFIG_NET_VENDOR_AMAZON is not set
349# CONFIG_NET_VENDOR_ARC is not set 353# CONFIG_NET_VENDOR_ARC is not set
350# CONFIG_NET_CADENCE is not set 354# CONFIG_NET_CADENCE is not set
351# CONFIG_NET_VENDOR_BROADCOM is not set 355# CONFIG_NET_VENDOR_BROADCOM is not set
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 74e3ad82eca9..e557c9de3fbc 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -91,9 +91,10 @@ CONFIG_NF_TABLES_INET=m
91CONFIG_NF_TABLES_NETDEV=m 91CONFIG_NF_TABLES_NETDEV=m
92CONFIG_NFT_EXTHDR=m 92CONFIG_NFT_EXTHDR=m
93CONFIG_NFT_META=m 93CONFIG_NFT_META=m
94CONFIG_NFT_NUMGEN=m
94CONFIG_NFT_CT=m 95CONFIG_NFT_CT=m
95CONFIG_NFT_RBTREE=m 96CONFIG_NFT_SET_RBTREE=m
96CONFIG_NFT_HASH=m 97CONFIG_NFT_SET_HASH=m
97CONFIG_NFT_COUNTER=m 98CONFIG_NFT_COUNTER=m
98CONFIG_NFT_LOG=m 99CONFIG_NFT_LOG=m
99CONFIG_NFT_LIMIT=m 100CONFIG_NFT_LIMIT=m
@@ -101,8 +102,10 @@ CONFIG_NFT_MASQ=m
101CONFIG_NFT_REDIR=m 102CONFIG_NFT_REDIR=m
102CONFIG_NFT_NAT=m 103CONFIG_NFT_NAT=m
103CONFIG_NFT_QUEUE=m 104CONFIG_NFT_QUEUE=m
105CONFIG_NFT_QUOTA=m
104CONFIG_NFT_REJECT=m 106CONFIG_NFT_REJECT=m
105CONFIG_NFT_COMPAT=m 107CONFIG_NFT_COMPAT=m
108CONFIG_NFT_HASH=m
106CONFIG_NFT_DUP_NETDEV=m 109CONFIG_NFT_DUP_NETDEV=m
107CONFIG_NFT_FWD_NETDEV=m 110CONFIG_NFT_FWD_NETDEV=m
108CONFIG_NETFILTER_XT_SET=m 111CONFIG_NETFILTER_XT_SET=m
@@ -353,6 +356,7 @@ CONFIG_NETCONSOLE=m
353CONFIG_NETCONSOLE_DYNAMIC=y 356CONFIG_NETCONSOLE_DYNAMIC=y
354CONFIG_VETH=m 357CONFIG_VETH=m
355# CONFIG_NET_VENDOR_3COM is not set 358# CONFIG_NET_VENDOR_3COM is not set
359# CONFIG_NET_VENDOR_AMAZON is not set
356# CONFIG_NET_VENDOR_AMD is not set 360# CONFIG_NET_VENDOR_AMD is not set
357# CONFIG_NET_VENDOR_ARC is not set 361# CONFIG_NET_VENDOR_ARC is not set
358# CONFIG_NET_CADENCE is not set 362# CONFIG_NET_CADENCE is not set
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 4ba8606a4e69..c6a748a36daf 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -88,9 +88,10 @@ CONFIG_NF_TABLES_INET=m
88CONFIG_NF_TABLES_NETDEV=m 88CONFIG_NF_TABLES_NETDEV=m
89CONFIG_NFT_EXTHDR=m 89CONFIG_NFT_EXTHDR=m
90CONFIG_NFT_META=m 90CONFIG_NFT_META=m
91CONFIG_NFT_NUMGEN=m
91CONFIG_NFT_CT=m 92CONFIG_NFT_CT=m
92CONFIG_NFT_RBTREE=m 93CONFIG_NFT_SET_RBTREE=m
93CONFIG_NFT_HASH=m 94CONFIG_NFT_SET_HASH=m
94CONFIG_NFT_COUNTER=m 95CONFIG_NFT_COUNTER=m
95CONFIG_NFT_LOG=m 96CONFIG_NFT_LOG=m
96CONFIG_NFT_LIMIT=m 97CONFIG_NFT_LIMIT=m
@@ -98,8 +99,10 @@ CONFIG_NFT_MASQ=m
98CONFIG_NFT_REDIR=m 99CONFIG_NFT_REDIR=m
99CONFIG_NFT_NAT=m 100CONFIG_NFT_NAT=m
100CONFIG_NFT_QUEUE=m 101CONFIG_NFT_QUEUE=m
102CONFIG_NFT_QUOTA=m
101CONFIG_NFT_REJECT=m 103CONFIG_NFT_REJECT=m
102CONFIG_NFT_COMPAT=m 104CONFIG_NFT_COMPAT=m
105CONFIG_NFT_HASH=m
103CONFIG_NFT_DUP_NETDEV=m 106CONFIG_NFT_DUP_NETDEV=m
104CONFIG_NFT_FWD_NETDEV=m 107CONFIG_NFT_FWD_NETDEV=m
105CONFIG_NETFILTER_XT_SET=m 108CONFIG_NETFILTER_XT_SET=m
@@ -343,6 +346,7 @@ CONFIG_MACSEC=m
343CONFIG_NETCONSOLE=m 346CONFIG_NETCONSOLE=m
344CONFIG_NETCONSOLE_DYNAMIC=y 347CONFIG_NETCONSOLE_DYNAMIC=y
345CONFIG_VETH=m 348CONFIG_VETH=m
349# CONFIG_NET_VENDOR_AMAZON is not set
346CONFIG_SUN3LANCE=y 350CONFIG_SUN3LANCE=y
347# CONFIG_NET_VENDOR_ARC is not set 351# CONFIG_NET_VENDOR_ARC is not set
348# CONFIG_NET_CADENCE is not set 352# CONFIG_NET_CADENCE is not set
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index c6f49726a6c9..10d60857b9a6 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -88,9 +88,10 @@ CONFIG_NF_TABLES_INET=m
88CONFIG_NF_TABLES_NETDEV=m 88CONFIG_NF_TABLES_NETDEV=m
89CONFIG_NFT_EXTHDR=m 89CONFIG_NFT_EXTHDR=m
90CONFIG_NFT_META=m 90CONFIG_NFT_META=m
91CONFIG_NFT_NUMGEN=m
91CONFIG_NFT_CT=m 92CONFIG_NFT_CT=m
92CONFIG_NFT_RBTREE=m 93CONFIG_NFT_SET_RBTREE=m
93CONFIG_NFT_HASH=m 94CONFIG_NFT_SET_HASH=m
94CONFIG_NFT_COUNTER=m 95CONFIG_NFT_COUNTER=m
95CONFIG_NFT_LOG=m 96CONFIG_NFT_LOG=m
96CONFIG_NFT_LIMIT=m 97CONFIG_NFT_LIMIT=m
@@ -98,8 +99,10 @@ CONFIG_NFT_MASQ=m
98CONFIG_NFT_REDIR=m 99CONFIG_NFT_REDIR=m
99CONFIG_NFT_NAT=m 100CONFIG_NFT_NAT=m
100CONFIG_NFT_QUEUE=m 101CONFIG_NFT_QUEUE=m
102CONFIG_NFT_QUOTA=m
101CONFIG_NFT_REJECT=m 103CONFIG_NFT_REJECT=m
102CONFIG_NFT_COMPAT=m 104CONFIG_NFT_COMPAT=m
105CONFIG_NFT_HASH=m
103CONFIG_NFT_DUP_NETDEV=m 106CONFIG_NFT_DUP_NETDEV=m
104CONFIG_NFT_FWD_NETDEV=m 107CONFIG_NFT_FWD_NETDEV=m
105CONFIG_NETFILTER_XT_SET=m 108CONFIG_NETFILTER_XT_SET=m
@@ -343,6 +346,7 @@ CONFIG_MACSEC=m
343CONFIG_NETCONSOLE=m 346CONFIG_NETCONSOLE=m
344CONFIG_NETCONSOLE_DYNAMIC=y 347CONFIG_NETCONSOLE_DYNAMIC=y
345CONFIG_VETH=m 348CONFIG_VETH=m
349# CONFIG_NET_VENDOR_AMAZON is not set
346CONFIG_SUN3LANCE=y 350CONFIG_SUN3LANCE=y
347# CONFIG_NET_VENDOR_ARC is not set 351# CONFIG_NET_VENDOR_ARC is not set
348# CONFIG_NET_CADENCE is not set 352# CONFIG_NET_CADENCE is not set
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-21 01:42:57 -0500