aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2017-10-30 03:13:32 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2017-11-09 17:02:58 -0500
commit5e387199c17c4d2fb8b72ada82fbf81f4ba6f317 (patch)
tree2360e626512d7eb22e881ed0ff303fcb46693584
parent92178fcabbcd39fc9ccd4e58ec4be83dd5323a46 (diff)
m68k/defconfig: Update defconfigs for v4.14-rc7
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat
-rw-r--r--arch/m68k/configs/amiga_defconfig6
-rw-r--r--arch/m68k/configs/apollo_defconfig6
-rw-r--r--arch/m68k/configs/atari_defconfig6
-rw-r--r--arch/m68k/configs/bvme6000_defconfig6
-rw-r--r--arch/m68k/configs/hp300_defconfig6
-rw-r--r--arch/m68k/configs/mac_defconfig6
-rw-r--r--arch/m68k/configs/multi_defconfig6
-rw-r--r--arch/m68k/configs/mvme147_defconfig6
-rw-r--r--arch/m68k/configs/mvme16x_defconfig6
-rw-r--r--arch/m68k/configs/q40_defconfig6
-rw-r--r--arch/m68k/configs/sun3_defconfig6
-rw-r--r--arch/m68k/configs/sun3x_defconfig6
12 files changed, 48 insertions, 24 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 54191f6fc715..5b5fa9831b4d 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -123,6 +123,7 @@ CONFIG_NFT_HASH=m
123CONFIG_NFT_FIB_INET=m 123CONFIG_NFT_FIB_INET=m
124CONFIG_NFT_DUP_NETDEV=m 124CONFIG_NFT_DUP_NETDEV=m
125CONFIG_NFT_FWD_NETDEV=m 125CONFIG_NFT_FWD_NETDEV=m
126CONFIG_NFT_FIB_NETDEV=m
126CONFIG_NETFILTER_XT_SET=m 127CONFIG_NETFILTER_XT_SET=m
127CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 128CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
128CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 129CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -302,6 +303,7 @@ CONFIG_MPLS=y
302CONFIG_NET_MPLS_GSO=m 303CONFIG_NET_MPLS_GSO=m
303CONFIG_MPLS_ROUTING=m 304CONFIG_MPLS_ROUTING=m
304CONFIG_MPLS_IPTUNNEL=m 305CONFIG_MPLS_IPTUNNEL=m
306CONFIG_NET_NSH=m
305CONFIG_NET_L3_MASTER_DEV=y 307CONFIG_NET_L3_MASTER_DEV=y
306CONFIG_AF_KCM=m 308CONFIG_AF_KCM=m
307# CONFIG_WIRELESS is not set 309# CONFIG_WIRELESS is not set
@@ -400,6 +402,7 @@ CONFIG_ARIADNE=y
400# CONFIG_NET_VENDOR_CIRRUS is not set 402# CONFIG_NET_VENDOR_CIRRUS is not set
401# CONFIG_NET_VENDOR_EZCHIP is not set 403# CONFIG_NET_VENDOR_EZCHIP is not set
402# CONFIG_NET_VENDOR_HP is not set 404# CONFIG_NET_VENDOR_HP is not set
405# CONFIG_NET_VENDOR_HUAWEI is not set
403# CONFIG_NET_VENDOR_INTEL is not set 406# CONFIG_NET_VENDOR_INTEL is not set
404# CONFIG_NET_VENDOR_MARVELL is not set 407# CONFIG_NET_VENDOR_MARVELL is not set
405# CONFIG_NET_VENDOR_MICREL is not set 408# CONFIG_NET_VENDOR_MICREL is not set
@@ -451,6 +454,7 @@ CONFIG_PPS_CLIENT_LDISC=m
451CONFIG_PPS_CLIENT_PARPORT=m 454CONFIG_PPS_CLIENT_PARPORT=m
452CONFIG_PTP_1588_CLOCK=m 455CONFIG_PTP_1588_CLOCK=m
453# CONFIG_HWMON is not set 456# CONFIG_HWMON is not set
457# CONFIG_RC_CORE is not set
454CONFIG_FB=y 458CONFIG_FB=y
455CONFIG_FB_CIRRUS=y 459CONFIG_FB_CIRRUS=y
456CONFIG_FB_AMIGA=y 460CONFIG_FB_AMIGA=y
@@ -607,12 +611,10 @@ CONFIG_CRYPTO_USER=m
607CONFIG_CRYPTO_CRYPTD=m 611CONFIG_CRYPTO_CRYPTD=m
608CONFIG_CRYPTO_MCRYPTD=m 612CONFIG_CRYPTO_MCRYPTD=m
609CONFIG_CRYPTO_TEST=m 613CONFIG_CRYPTO_TEST=m
610CONFIG_CRYPTO_CCM=m
611CONFIG_CRYPTO_CHACHA20POLY1305=m 614CONFIG_CRYPTO_CHACHA20POLY1305=m
612CONFIG_CRYPTO_LRW=m 615CONFIG_CRYPTO_LRW=m
613CONFIG_CRYPTO_PCBC=m 616CONFIG_CRYPTO_PCBC=m
614CONFIG_CRYPTO_KEYWRAP=m 617CONFIG_CRYPTO_KEYWRAP=m
615CONFIG_CRYPTO_CMAC=m
616CONFIG_CRYPTO_XCBC=m 618CONFIG_CRYPTO_XCBC=m
617CONFIG_CRYPTO_VMAC=m 619CONFIG_CRYPTO_VMAC=m
618CONFIG_CRYPTO_MICHAEL_MIC=m 620CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index fb4663904428..72a7764b74ed 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -121,6 +121,7 @@ CONFIG_NFT_HASH=m
121CONFIG_NFT_FIB_INET=m 121CONFIG_NFT_FIB_INET=m
122CONFIG_NFT_DUP_NETDEV=m 122CONFIG_NFT_DUP_NETDEV=m
123CONFIG_NFT_FWD_NETDEV=m 123CONFIG_NFT_FWD_NETDEV=m
124CONFIG_NFT_FIB_NETDEV=m
124CONFIG_NETFILTER_XT_SET=m 125CONFIG_NETFILTER_XT_SET=m
125CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 126CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
126CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 127CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -300,6 +301,7 @@ CONFIG_MPLS=y
300CONFIG_NET_MPLS_GSO=m 301CONFIG_NET_MPLS_GSO=m
301CONFIG_MPLS_ROUTING=m 302CONFIG_MPLS_ROUTING=m
302CONFIG_MPLS_IPTUNNEL=m 303CONFIG_MPLS_IPTUNNEL=m
304CONFIG_NET_NSH=m
303CONFIG_NET_L3_MASTER_DEV=y 305CONFIG_NET_L3_MASTER_DEV=y
304CONFIG_AF_KCM=m 306CONFIG_AF_KCM=m
305# CONFIG_WIRELESS is not set 307# CONFIG_WIRELESS is not set
@@ -377,6 +379,7 @@ CONFIG_VETH=m
377# CONFIG_NET_CADENCE is not set 379# CONFIG_NET_CADENCE is not set
378# CONFIG_NET_VENDOR_BROADCOM is not set 380# CONFIG_NET_VENDOR_BROADCOM is not set
379# CONFIG_NET_VENDOR_EZCHIP is not set 381# CONFIG_NET_VENDOR_EZCHIP is not set
382# CONFIG_NET_VENDOR_HUAWEI is not set
380# CONFIG_NET_VENDOR_INTEL is not set 383# CONFIG_NET_VENDOR_INTEL is not set
381# CONFIG_NET_VENDOR_MARVELL is not set 384# CONFIG_NET_VENDOR_MARVELL is not set
382# CONFIG_NET_VENDOR_MICREL is not set 385# CONFIG_NET_VENDOR_MICREL is not set
@@ -419,6 +422,7 @@ CONFIG_NTP_PPS=y
419CONFIG_PPS_CLIENT_LDISC=m 422CONFIG_PPS_CLIENT_LDISC=m
420CONFIG_PTP_1588_CLOCK=m 423CONFIG_PTP_1588_CLOCK=m
421# CONFIG_HWMON is not set 424# CONFIG_HWMON is not set
425# CONFIG_RC_CORE is not set
422CONFIG_FB=y 426CONFIG_FB=y
423CONFIG_FRAMEBUFFER_CONSOLE=y 427CONFIG_FRAMEBUFFER_CONSOLE=y
424CONFIG_LOGO=y 428CONFIG_LOGO=y
@@ -566,12 +570,10 @@ CONFIG_CRYPTO_USER=m
566CONFIG_CRYPTO_CRYPTD=m 570CONFIG_CRYPTO_CRYPTD=m
567CONFIG_CRYPTO_MCRYPTD=m 571CONFIG_CRYPTO_MCRYPTD=m
568CONFIG_CRYPTO_TEST=m 572CONFIG_CRYPTO_TEST=m
569CONFIG_CRYPTO_CCM=m
570CONFIG_CRYPTO_CHACHA20POLY1305=m 573CONFIG_CRYPTO_CHACHA20POLY1305=m
571CONFIG_CRYPTO_LRW=m 574CONFIG_CRYPTO_LRW=m
572CONFIG_CRYPTO_PCBC=m 575CONFIG_CRYPTO_PCBC=m
573CONFIG_CRYPTO_KEYWRAP=m 576CONFIG_CRYPTO_KEYWRAP=m
574CONFIG_CRYPTO_CMAC=m
575CONFIG_CRYPTO_XCBC=m 577CONFIG_CRYPTO_XCBC=m
576CONFIG_CRYPTO_VMAC=m 578CONFIG_CRYPTO_VMAC=m
577CONFIG_CRYPTO_MICHAEL_MIC=m 579CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index 4ab393e86e52..884b43a2f0d9 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -121,6 +121,7 @@ CONFIG_NFT_HASH=m
121CONFIG_NFT_FIB_INET=m 121CONFIG_NFT_FIB_INET=m
122CONFIG_NFT_DUP_NETDEV=m 122CONFIG_NFT_DUP_NETDEV=m
123CONFIG_NFT_FWD_NETDEV=m 123CONFIG_NFT_FWD_NETDEV=m
124CONFIG_NFT_FIB_NETDEV=m
124CONFIG_NETFILTER_XT_SET=m 125CONFIG_NETFILTER_XT_SET=m
125CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 126CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
126CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 127CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -300,6 +301,7 @@ CONFIG_MPLS=y
300CONFIG_NET_MPLS_GSO=m 301CONFIG_NET_MPLS_GSO=m
301CONFIG_MPLS_ROUTING=m 302CONFIG_MPLS_ROUTING=m
302CONFIG_MPLS_IPTUNNEL=m 303CONFIG_MPLS_IPTUNNEL=m
304CONFIG_NET_NSH=m
303CONFIG_NET_L3_MASTER_DEV=y 305CONFIG_NET_L3_MASTER_DEV=y
304CONFIG_AF_KCM=m 306CONFIG_AF_KCM=m
305# CONFIG_WIRELESS is not set 307# CONFIG_WIRELESS is not set
@@ -387,6 +389,7 @@ CONFIG_ATARILANCE=y
387# CONFIG_NET_CADENCE is not set 389# CONFIG_NET_CADENCE is not set
388# CONFIG_NET_VENDOR_BROADCOM is not set 390# CONFIG_NET_VENDOR_BROADCOM is not set
389# CONFIG_NET_VENDOR_EZCHIP is not set 391# CONFIG_NET_VENDOR_EZCHIP is not set
392# CONFIG_NET_VENDOR_HUAWEI is not set
390# CONFIG_NET_VENDOR_INTEL is not set 393# CONFIG_NET_VENDOR_INTEL is not set
391# CONFIG_NET_VENDOR_MARVELL is not set 394# CONFIG_NET_VENDOR_MARVELL is not set
392# CONFIG_NET_VENDOR_MICREL is not set 395# CONFIG_NET_VENDOR_MICREL is not set
@@ -434,6 +437,7 @@ CONFIG_PPS_CLIENT_LDISC=m
434CONFIG_PPS_CLIENT_PARPORT=m 437CONFIG_PPS_CLIENT_PARPORT=m
435CONFIG_PTP_1588_CLOCK=m 438CONFIG_PTP_1588_CLOCK=m
436# CONFIG_HWMON is not set 439# CONFIG_HWMON is not set
440# CONFIG_RC_CORE is not set
437CONFIG_FB=y 441CONFIG_FB=y
438CONFIG_FB_ATARI=y 442CONFIG_FB_ATARI=y
439CONFIG_FRAMEBUFFER_CONSOLE=y 443CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -588,12 +592,10 @@ CONFIG_CRYPTO_USER=m
588CONFIG_CRYPTO_CRYPTD=m 592CONFIG_CRYPTO_CRYPTD=m
589CONFIG_CRYPTO_MCRYPTD=m 593CONFIG_CRYPTO_MCRYPTD=m
590CONFIG_CRYPTO_TEST=m 594CONFIG_CRYPTO_TEST=m
591CONFIG_CRYPTO_CCM=m
592CONFIG_CRYPTO_CHACHA20POLY1305=m 595CONFIG_CRYPTO_CHACHA20POLY1305=m
593CONFIG_CRYPTO_LRW=m 596CONFIG_CRYPTO_LRW=m
594CONFIG_CRYPTO_PCBC=m 597CONFIG_CRYPTO_PCBC=m
595CONFIG_CRYPTO_KEYWRAP=m 598CONFIG_CRYPTO_KEYWRAP=m
596CONFIG_CRYPTO_CMAC=m
597CONFIG_CRYPTO_XCBC=m 599CONFIG_CRYPTO_XCBC=m
598CONFIG_CRYPTO_VMAC=m 600CONFIG_CRYPTO_VMAC=m
599CONFIG_CRYPTO_MICHAEL_MIC=m 601CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 1dd8d697545b..fcfa60d31499 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -119,6 +119,7 @@ CONFIG_NFT_HASH=m
119CONFIG_NFT_FIB_INET=m 119CONFIG_NFT_FIB_INET=m
120CONFIG_NFT_DUP_NETDEV=m 120CONFIG_NFT_DUP_NETDEV=m
121CONFIG_NFT_FWD_NETDEV=m 121CONFIG_NFT_FWD_NETDEV=m
122CONFIG_NFT_FIB_NETDEV=m
122CONFIG_NETFILTER_XT_SET=m 123CONFIG_NETFILTER_XT_SET=m
123CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 124CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
124CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 125CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -298,6 +299,7 @@ CONFIG_MPLS=y
298CONFIG_NET_MPLS_GSO=m 299CONFIG_NET_MPLS_GSO=m
299CONFIG_MPLS_ROUTING=m 300CONFIG_MPLS_ROUTING=m
300CONFIG_MPLS_IPTUNNEL=m 301CONFIG_MPLS_IPTUNNEL=m
302CONFIG_NET_NSH=m
301CONFIG_NET_L3_MASTER_DEV=y 303CONFIG_NET_L3_MASTER_DEV=y
302CONFIG_AF_KCM=m 304CONFIG_AF_KCM=m
303# CONFIG_WIRELESS is not set 305# CONFIG_WIRELESS is not set
@@ -376,6 +378,7 @@ CONFIG_VETH=m
376# CONFIG_NET_CADENCE is not set 378# CONFIG_NET_CADENCE is not set
377# CONFIG_NET_VENDOR_BROADCOM is not set 379# CONFIG_NET_VENDOR_BROADCOM is not set
378# CONFIG_NET_VENDOR_EZCHIP is not set 380# CONFIG_NET_VENDOR_EZCHIP is not set
381# CONFIG_NET_VENDOR_HUAWEI is not set
379CONFIG_BVME6000_NET=y 382CONFIG_BVME6000_NET=y
380# CONFIG_NET_VENDOR_MARVELL is not set 383# CONFIG_NET_VENDOR_MARVELL is not set
381# CONFIG_NET_VENDOR_MICREL is not set 384# CONFIG_NET_VENDOR_MICREL is not set
@@ -417,6 +420,7 @@ CONFIG_NTP_PPS=y
417CONFIG_PPS_CLIENT_LDISC=m 420CONFIG_PPS_CLIENT_LDISC=m
418CONFIG_PTP_1588_CLOCK=m 421CONFIG_PTP_1588_CLOCK=m
419# CONFIG_HWMON is not set 422# CONFIG_HWMON is not set
423# CONFIG_RC_CORE is not set
420CONFIG_HID=m 424CONFIG_HID=m
421CONFIG_HIDRAW=y 425CONFIG_HIDRAW=y
422CONFIG_UHID=m 426CONFIG_UHID=m
@@ -558,12 +562,10 @@ CONFIG_CRYPTO_USER=m
558CONFIG_CRYPTO_CRYPTD=m 562CONFIG_CRYPTO_CRYPTD=m
559CONFIG_CRYPTO_MCRYPTD=m 563CONFIG_CRYPTO_MCRYPTD=m
560CONFIG_CRYPTO_TEST=m 564CONFIG_CRYPTO_TEST=m
561CONFIG_CRYPTO_CCM=m
562CONFIG_CRYPTO_CHACHA20POLY1305=m 565CONFIG_CRYPTO_CHACHA20POLY1305=m
563CONFIG_CRYPTO_LRW=m 566CONFIG_CRYPTO_LRW=m
564CONFIG_CRYPTO_PCBC=m 567CONFIG_CRYPTO_PCBC=m
565CONFIG_CRYPTO_KEYWRAP=m 568CONFIG_CRYPTO_KEYWRAP=m
566CONFIG_CRYPTO_CMAC=m
567CONFIG_CRYPTO_XCBC=m 569CONFIG_CRYPTO_XCBC=m
568CONFIG_CRYPTO_VMAC=m 570CONFIG_CRYPTO_VMAC=m
569CONFIG_CRYPTO_MICHAEL_MIC=m 571CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 02b39f50076e..9d597bbbbbfe 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -121,6 +121,7 @@ CONFIG_NFT_HASH=m
121CONFIG_NFT_FIB_INET=m 121CONFIG_NFT_FIB_INET=m
122CONFIG_NFT_DUP_NETDEV=m 122CONFIG_NFT_DUP_NETDEV=m
123CONFIG_NFT_FWD_NETDEV=m 123CONFIG_NFT_FWD_NETDEV=m
124CONFIG_NFT_FIB_NETDEV=m
124CONFIG_NETFILTER_XT_SET=m 125CONFIG_NETFILTER_XT_SET=m
125CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 126CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
126CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 127CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -300,6 +301,7 @@ CONFIG_MPLS=y
300CONFIG_NET_MPLS_GSO=m 301CONFIG_NET_MPLS_GSO=m
301CONFIG_MPLS_ROUTING=m 302CONFIG_MPLS_ROUTING=m
302CONFIG_MPLS_IPTUNNEL=m 303CONFIG_MPLS_IPTUNNEL=m
304CONFIG_NET_NSH=m
303CONFIG_NET_L3_MASTER_DEV=y 305CONFIG_NET_L3_MASTER_DEV=y
304CONFIG_AF_KCM=m 306CONFIG_AF_KCM=m
305# CONFIG_WIRELESS is not set 307# CONFIG_WIRELESS is not set
@@ -378,6 +380,7 @@ CONFIG_HPLANCE=y
378# CONFIG_NET_CADENCE is not set 380# CONFIG_NET_CADENCE is not set
379# CONFIG_NET_VENDOR_BROADCOM is not set 381# CONFIG_NET_VENDOR_BROADCOM is not set
380# CONFIG_NET_VENDOR_EZCHIP is not set 382# CONFIG_NET_VENDOR_EZCHIP is not set
383# CONFIG_NET_VENDOR_HUAWEI is not set
381# CONFIG_NET_VENDOR_INTEL is not set 384# CONFIG_NET_VENDOR_INTEL is not set
382# CONFIG_NET_VENDOR_MARVELL is not set 385# CONFIG_NET_VENDOR_MARVELL is not set
383# CONFIG_NET_VENDOR_MICREL is not set 386# CONFIG_NET_VENDOR_MICREL is not set
@@ -422,6 +425,7 @@ CONFIG_NTP_PPS=y
422CONFIG_PPS_CLIENT_LDISC=m 425CONFIG_PPS_CLIENT_LDISC=m
423CONFIG_PTP_1588_CLOCK=m 426CONFIG_PTP_1588_CLOCK=m
424# CONFIG_HWMON is not set 427# CONFIG_HWMON is not set
428# CONFIG_RC_CORE is not set
425CONFIG_FB=y 429CONFIG_FB=y
426CONFIG_FRAMEBUFFER_CONSOLE=y 430CONFIG_FRAMEBUFFER_CONSOLE=y
427CONFIG_LOGO=y 431CONFIG_LOGO=y
@@ -568,12 +572,10 @@ CONFIG_CRYPTO_USER=m
568CONFIG_CRYPTO_CRYPTD=m 572CONFIG_CRYPTO_CRYPTD=m
569CONFIG_CRYPTO_MCRYPTD=m 573CONFIG_CRYPTO_MCRYPTD=m
570CONFIG_CRYPTO_TEST=m 574CONFIG_CRYPTO_TEST=m
571CONFIG_CRYPTO_CCM=m
572CONFIG_CRYPTO_CHACHA20POLY1305=m 575CONFIG_CRYPTO_CHACHA20POLY1305=m
573CONFIG_CRYPTO_LRW=m 576CONFIG_CRYPTO_LRW=m
574CONFIG_CRYPTO_PCBC=m 577CONFIG_CRYPTO_PCBC=m
575CONFIG_CRYPTO_KEYWRAP=m 578CONFIG_CRYPTO_KEYWRAP=m
576CONFIG_CRYPTO_CMAC=m
577CONFIG_CRYPTO_XCBC=m 579CONFIG_CRYPTO_XCBC=m
578CONFIG_CRYPTO_VMAC=m 580CONFIG_CRYPTO_VMAC=m
579CONFIG_CRYPTO_MICHAEL_MIC=m 581CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 044dcb2bf8fb..45da20d1286c 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -120,6 +120,7 @@ CONFIG_NFT_HASH=m
120CONFIG_NFT_FIB_INET=m 120CONFIG_NFT_FIB_INET=m
121CONFIG_NFT_DUP_NETDEV=m 121CONFIG_NFT_DUP_NETDEV=m
122CONFIG_NFT_FWD_NETDEV=m 122CONFIG_NFT_FWD_NETDEV=m
123CONFIG_NFT_FIB_NETDEV=m
123CONFIG_NETFILTER_XT_SET=m 124CONFIG_NETFILTER_XT_SET=m
124CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 125CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
125CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 126CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -302,6 +303,7 @@ CONFIG_MPLS=y
302CONFIG_NET_MPLS_GSO=m 303CONFIG_NET_MPLS_GSO=m
303CONFIG_MPLS_ROUTING=m 304CONFIG_MPLS_ROUTING=m
304CONFIG_MPLS_IPTUNNEL=m 305CONFIG_MPLS_IPTUNNEL=m
306CONFIG_NET_NSH=m
305CONFIG_NET_L3_MASTER_DEV=y 307CONFIG_NET_L3_MASTER_DEV=y
306CONFIG_AF_KCM=m 308CONFIG_AF_KCM=m
307# CONFIG_WIRELESS is not set 309# CONFIG_WIRELESS is not set
@@ -395,6 +397,7 @@ CONFIG_MACMACE=y
395# CONFIG_NET_VENDOR_BROADCOM is not set 397# CONFIG_NET_VENDOR_BROADCOM is not set
396CONFIG_MAC89x0=y 398CONFIG_MAC89x0=y
397# CONFIG_NET_VENDOR_EZCHIP is not set 399# CONFIG_NET_VENDOR_EZCHIP is not set
400# CONFIG_NET_VENDOR_HUAWEI is not set
398# CONFIG_NET_VENDOR_INTEL is not set 401# CONFIG_NET_VENDOR_INTEL is not set
399# CONFIG_NET_VENDOR_MARVELL is not set 402# CONFIG_NET_VENDOR_MARVELL is not set
400# CONFIG_NET_VENDOR_MICREL is not set 403# CONFIG_NET_VENDOR_MICREL is not set
@@ -444,6 +447,7 @@ CONFIG_NTP_PPS=y
444CONFIG_PPS_CLIENT_LDISC=m 447CONFIG_PPS_CLIENT_LDISC=m
445CONFIG_PTP_1588_CLOCK=m 448CONFIG_PTP_1588_CLOCK=m
446# CONFIG_HWMON is not set 449# CONFIG_HWMON is not set
450# CONFIG_RC_CORE is not set
447CONFIG_FB=y 451CONFIG_FB=y
448CONFIG_FB_VALKYRIE=y 452CONFIG_FB_VALKYRIE=y
449CONFIG_FB_MAC=y 453CONFIG_FB_MAC=y
@@ -590,12 +594,10 @@ CONFIG_CRYPTO_USER=m
590CONFIG_CRYPTO_CRYPTD=m 594CONFIG_CRYPTO_CRYPTD=m
591CONFIG_CRYPTO_MCRYPTD=m 595CONFIG_CRYPTO_MCRYPTD=m
592CONFIG_CRYPTO_TEST=m 596CONFIG_CRYPTO_TEST=m
593CONFIG_CRYPTO_CCM=m
594CONFIG_CRYPTO_CHACHA20POLY1305=m 597CONFIG_CRYPTO_CHACHA20POLY1305=m
595CONFIG_CRYPTO_LRW=m 598CONFIG_CRYPTO_LRW=m
596CONFIG_CRYPTO_PCBC=m 599CONFIG_CRYPTO_PCBC=m
597CONFIG_CRYPTO_KEYWRAP=m 600CONFIG_CRYPTO_KEYWRAP=m
598CONFIG_CRYPTO_CMAC=m
599CONFIG_CRYPTO_XCBC=m 601CONFIG_CRYPTO_XCBC=m
600CONFIG_CRYPTO_VMAC=m 602CONFIG_CRYPTO_VMAC=m
601CONFIG_CRYPTO_MICHAEL_MIC=m 603CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 3ad04682077a..fda880c10861 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -130,6 +130,7 @@ CONFIG_NFT_HASH=m
130CONFIG_NFT_FIB_INET=m 130CONFIG_NFT_FIB_INET=m
131CONFIG_NFT_DUP_NETDEV=m 131CONFIG_NFT_DUP_NETDEV=m
132CONFIG_NFT_FWD_NETDEV=m 132CONFIG_NFT_FWD_NETDEV=m
133CONFIG_NFT_FIB_NETDEV=m
133CONFIG_NETFILTER_XT_SET=m 134CONFIG_NETFILTER_XT_SET=m
134CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 135CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
135CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 136CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -312,6 +313,7 @@ CONFIG_MPLS=y
312CONFIG_NET_MPLS_GSO=m 313CONFIG_NET_MPLS_GSO=m
313CONFIG_MPLS_ROUTING=m 314CONFIG_MPLS_ROUTING=m
314CONFIG_MPLS_IPTUNNEL=m 315CONFIG_MPLS_IPTUNNEL=m
316CONFIG_NET_NSH=m
315CONFIG_NET_L3_MASTER_DEV=y 317CONFIG_NET_L3_MASTER_DEV=y
316CONFIG_AF_KCM=m 318CONFIG_AF_KCM=m
317# CONFIG_WIRELESS is not set 319# CONFIG_WIRELESS is not set
@@ -436,6 +438,7 @@ CONFIG_MACMACE=y
436CONFIG_MAC89x0=y 438CONFIG_MAC89x0=y
437# CONFIG_NET_VENDOR_EZCHIP is not set 439# CONFIG_NET_VENDOR_EZCHIP is not set
438# CONFIG_NET_VENDOR_HP is not set 440# CONFIG_NET_VENDOR_HP is not set
441# CONFIG_NET_VENDOR_HUAWEI is not set
439CONFIG_BVME6000_NET=y 442CONFIG_BVME6000_NET=y
440CONFIG_MVME16x_NET=y 443CONFIG_MVME16x_NET=y
441# CONFIG_NET_VENDOR_MARVELL is not set 444# CONFIG_NET_VENDOR_MARVELL is not set
@@ -501,6 +504,7 @@ CONFIG_PPS_CLIENT_LDISC=m
501CONFIG_PPS_CLIENT_PARPORT=m 504CONFIG_PPS_CLIENT_PARPORT=m
502CONFIG_PTP_1588_CLOCK=m 505CONFIG_PTP_1588_CLOCK=m
503# CONFIG_HWMON is not set 506# CONFIG_HWMON is not set
507# CONFIG_RC_CORE is not set
504CONFIG_FB=y 508CONFIG_FB=y
505CONFIG_FB_CIRRUS=y 509CONFIG_FB_CIRRUS=y
506CONFIG_FB_AMIGA=y 510CONFIG_FB_AMIGA=y
@@ -670,12 +674,10 @@ CONFIG_CRYPTO_USER=m
670CONFIG_CRYPTO_CRYPTD=m 674CONFIG_CRYPTO_CRYPTD=m
671CONFIG_CRYPTO_MCRYPTD=m 675CONFIG_CRYPTO_MCRYPTD=m
672CONFIG_CRYPTO_TEST=m 676CONFIG_CRYPTO_TEST=m
673CONFIG_CRYPTO_CCM=m
674CONFIG_CRYPTO_CHACHA20POLY1305=m 677CONFIG_CRYPTO_CHACHA20POLY1305=m
675CONFIG_CRYPTO_LRW=m 678CONFIG_CRYPTO_LRW=m
676CONFIG_CRYPTO_PCBC=m 679CONFIG_CRYPTO_PCBC=m
677CONFIG_CRYPTO_KEYWRAP=m 680CONFIG_CRYPTO_KEYWRAP=m
678CONFIG_CRYPTO_CMAC=m
679CONFIG_CRYPTO_XCBC=m 681CONFIG_CRYPTO_XCBC=m
680CONFIG_CRYPTO_VMAC=m 682CONFIG_CRYPTO_VMAC=m
681CONFIG_CRYPTO_MICHAEL_MIC=m 683CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index dc2dd61948cd..7d5e4863efec 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -118,6 +118,7 @@ CONFIG_NFT_HASH=m
118CONFIG_NFT_FIB_INET=m 118CONFIG_NFT_FIB_INET=m
119CONFIG_NFT_DUP_NETDEV=m 119CONFIG_NFT_DUP_NETDEV=m
120CONFIG_NFT_FWD_NETDEV=m 120CONFIG_NFT_FWD_NETDEV=m
121CONFIG_NFT_FIB_NETDEV=m
121CONFIG_NETFILTER_XT_SET=m 122CONFIG_NETFILTER_XT_SET=m
122CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 123CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
123CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 124CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -297,6 +298,7 @@ CONFIG_MPLS=y
297CONFIG_NET_MPLS_GSO=m 298CONFIG_NET_MPLS_GSO=m
298CONFIG_MPLS_ROUTING=m 299CONFIG_MPLS_ROUTING=m
299CONFIG_MPLS_IPTUNNEL=m 300CONFIG_MPLS_IPTUNNEL=m
301CONFIG_NET_NSH=m
300CONFIG_NET_L3_MASTER_DEV=y 302CONFIG_NET_L3_MASTER_DEV=y
301CONFIG_AF_KCM=m 303CONFIG_AF_KCM=m
302# CONFIG_WIRELESS is not set 304# CONFIG_WIRELESS is not set
@@ -376,6 +378,7 @@ CONFIG_MVME147_NET=y
376# CONFIG_NET_CADENCE is not set 378# CONFIG_NET_CADENCE is not set
377# CONFIG_NET_VENDOR_BROADCOM is not set 379# CONFIG_NET_VENDOR_BROADCOM is not set
378# CONFIG_NET_VENDOR_EZCHIP is not set 380# CONFIG_NET_VENDOR_EZCHIP is not set
381# CONFIG_NET_VENDOR_HUAWEI is not set
379# CONFIG_NET_VENDOR_INTEL is not set 382# CONFIG_NET_VENDOR_INTEL is not set
380# CONFIG_NET_VENDOR_MARVELL is not set 383# CONFIG_NET_VENDOR_MARVELL is not set
381# CONFIG_NET_VENDOR_MICREL is not set 384# CONFIG_NET_VENDOR_MICREL is not set
@@ -417,6 +420,7 @@ CONFIG_NTP_PPS=y
417CONFIG_PPS_CLIENT_LDISC=m 420CONFIG_PPS_CLIENT_LDISC=m
418CONFIG_PTP_1588_CLOCK=m 421CONFIG_PTP_1588_CLOCK=m
419# CONFIG_HWMON is not set 422# CONFIG_HWMON is not set
423# CONFIG_RC_CORE is not set
420CONFIG_HID=m 424CONFIG_HID=m
421CONFIG_HIDRAW=y 425CONFIG_HIDRAW=y
422CONFIG_UHID=m 426CONFIG_UHID=m
@@ -558,12 +562,10 @@ CONFIG_CRYPTO_USER=m
558CONFIG_CRYPTO_CRYPTD=m 562CONFIG_CRYPTO_CRYPTD=m
559CONFIG_CRYPTO_MCRYPTD=m 563CONFIG_CRYPTO_MCRYPTD=m
560CONFIG_CRYPTO_TEST=m 564CONFIG_CRYPTO_TEST=m
561CONFIG_CRYPTO_CCM=m
562CONFIG_CRYPTO_CHACHA20POLY1305=m 565CONFIG_CRYPTO_CHACHA20POLY1305=m
563CONFIG_CRYPTO_LRW=m 566CONFIG_CRYPTO_LRW=m
564CONFIG_CRYPTO_PCBC=m 567CONFIG_CRYPTO_PCBC=m
565CONFIG_CRYPTO_KEYWRAP=m 568CONFIG_CRYPTO_KEYWRAP=m
566CONFIG_CRYPTO_CMAC=m
567CONFIG_CRYPTO_XCBC=m 569CONFIG_CRYPTO_XCBC=m
568CONFIG_CRYPTO_VMAC=m 570CONFIG_CRYPTO_VMAC=m
569CONFIG_CRYPTO_MICHAEL_MIC=m 571CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 54e7b523fc3d..7763b71a9c49 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -119,6 +119,7 @@ CONFIG_NFT_HASH=m
119CONFIG_NFT_FIB_INET=m 119CONFIG_NFT_FIB_INET=m
120CONFIG_NFT_DUP_NETDEV=m 120CONFIG_NFT_DUP_NETDEV=m
121CONFIG_NFT_FWD_NETDEV=m 121CONFIG_NFT_FWD_NETDEV=m
122CONFIG_NFT_FIB_NETDEV=m
122CONFIG_NETFILTER_XT_SET=m 123CONFIG_NETFILTER_XT_SET=m
123CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 124CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
124CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 125CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -298,6 +299,7 @@ CONFIG_MPLS=y
298CONFIG_NET_MPLS_GSO=m 299CONFIG_NET_MPLS_GSO=m
299CONFIG_MPLS_ROUTING=m 300CONFIG_MPLS_ROUTING=m
300CONFIG_MPLS_IPTUNNEL=m 301CONFIG_MPLS_IPTUNNEL=m
302CONFIG_NET_NSH=m
301CONFIG_NET_L3_MASTER_DEV=y 303CONFIG_NET_L3_MASTER_DEV=y
302CONFIG_AF_KCM=m 304CONFIG_AF_KCM=m
303# CONFIG_WIRELESS is not set 305# CONFIG_WIRELESS is not set
@@ -376,6 +378,7 @@ CONFIG_VETH=m
376# CONFIG_NET_CADENCE is not set 378# CONFIG_NET_CADENCE is not set
377# CONFIG_NET_VENDOR_BROADCOM is not set 379# CONFIG_NET_VENDOR_BROADCOM is not set
378# CONFIG_NET_VENDOR_EZCHIP is not set 380# CONFIG_NET_VENDOR_EZCHIP is not set
381# CONFIG_NET_VENDOR_HUAWEI is not set
379CONFIG_MVME16x_NET=y 382CONFIG_MVME16x_NET=y
380# CONFIG_NET_VENDOR_MARVELL is not set 383# CONFIG_NET_VENDOR_MARVELL is not set
381# CONFIG_NET_VENDOR_MICREL is not set 384# CONFIG_NET_VENDOR_MICREL is not set
@@ -417,6 +420,7 @@ CONFIG_NTP_PPS=y
417CONFIG_PPS_CLIENT_LDISC=m 420CONFIG_PPS_CLIENT_LDISC=m
418CONFIG_PTP_1588_CLOCK=m 421CONFIG_PTP_1588_CLOCK=m
419# CONFIG_HWMON is not set 422# CONFIG_HWMON is not set
423# CONFIG_RC_CORE is not set
420CONFIG_HID=m 424CONFIG_HID=m
421CONFIG_HIDRAW=y 425CONFIG_HIDRAW=y
422CONFIG_UHID=m 426CONFIG_UHID=m
@@ -558,12 +562,10 @@ CONFIG_CRYPTO_USER=m
558CONFIG_CRYPTO_CRYPTD=m 562CONFIG_CRYPTO_CRYPTD=m
559CONFIG_CRYPTO_MCRYPTD=m 563CONFIG_CRYPTO_MCRYPTD=m
560CONFIG_CRYPTO_TEST=m 564CONFIG_CRYPTO_TEST=m
561CONFIG_CRYPTO_CCM=m
562CONFIG_CRYPTO_CHACHA20POLY1305=m 565CONFIG_CRYPTO_CHACHA20POLY1305=m
563CONFIG_CRYPTO_LRW=m 566CONFIG_CRYPTO_LRW=m
564CONFIG_CRYPTO_PCBC=m 567CONFIG_CRYPTO_PCBC=m
565CONFIG_CRYPTO_KEYWRAP=m 568CONFIG_CRYPTO_KEYWRAP=m
566CONFIG_CRYPTO_CMAC=m
567CONFIG_CRYPTO_XCBC=m 569CONFIG_CRYPTO_XCBC=m
568CONFIG_CRYPTO_VMAC=m 570CONFIG_CRYPTO_VMAC=m
569CONFIG_CRYPTO_MICHAEL_MIC=m 571CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index d63d8a15f6db..17eaebfa3e19 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -119,6 +119,7 @@ CONFIG_NFT_HASH=m
119CONFIG_NFT_FIB_INET=m 119CONFIG_NFT_FIB_INET=m
120CONFIG_NFT_DUP_NETDEV=m 120CONFIG_NFT_DUP_NETDEV=m
121CONFIG_NFT_FWD_NETDEV=m 121CONFIG_NFT_FWD_NETDEV=m
122CONFIG_NFT_FIB_NETDEV=m
122CONFIG_NETFILTER_XT_SET=m 123CONFIG_NETFILTER_XT_SET=m
123CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 124CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
124CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 125CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -298,6 +299,7 @@ CONFIG_MPLS=y
298CONFIG_NET_MPLS_GSO=m 299CONFIG_NET_MPLS_GSO=m
299CONFIG_MPLS_ROUTING=m 300CONFIG_MPLS_ROUTING=m
300CONFIG_MPLS_IPTUNNEL=m 301CONFIG_MPLS_IPTUNNEL=m
302CONFIG_NET_NSH=m
301CONFIG_NET_L3_MASTER_DEV=y 303CONFIG_NET_L3_MASTER_DEV=y
302CONFIG_AF_KCM=m 304CONFIG_AF_KCM=m
303# CONFIG_WIRELESS is not set 305# CONFIG_WIRELESS is not set
@@ -386,6 +388,7 @@ CONFIG_VETH=m
386# CONFIG_NET_VENDOR_CIRRUS is not set 388# CONFIG_NET_VENDOR_CIRRUS is not set
387# CONFIG_NET_VENDOR_EZCHIP is not set 389# CONFIG_NET_VENDOR_EZCHIP is not set
388# CONFIG_NET_VENDOR_HP is not set 390# CONFIG_NET_VENDOR_HP is not set
391# CONFIG_NET_VENDOR_HUAWEI is not set
389# CONFIG_NET_VENDOR_INTEL is not set 392# CONFIG_NET_VENDOR_INTEL is not set
390# CONFIG_NET_VENDOR_MARVELL is not set 393# CONFIG_NET_VENDOR_MARVELL is not set
391# CONFIG_NET_VENDOR_MICREL is not set 394# CONFIG_NET_VENDOR_MICREL is not set
@@ -434,6 +437,7 @@ CONFIG_PPS_CLIENT_LDISC=m
434CONFIG_PPS_CLIENT_PARPORT=m 437CONFIG_PPS_CLIENT_PARPORT=m
435CONFIG_PTP_1588_CLOCK=m 438CONFIG_PTP_1588_CLOCK=m
436# CONFIG_HWMON is not set 439# CONFIG_HWMON is not set
440# CONFIG_RC_CORE is not set
437CONFIG_FB=y 441CONFIG_FB=y
438CONFIG_FRAMEBUFFER_CONSOLE=y 442CONFIG_FRAMEBUFFER_CONSOLE=y
439CONFIG_LOGO=y 443CONFIG_LOGO=y
@@ -581,12 +585,10 @@ CONFIG_CRYPTO_USER=m
581CONFIG_CRYPTO_CRYPTD=m 585CONFIG_CRYPTO_CRYPTD=m
582CONFIG_CRYPTO_MCRYPTD=m 586CONFIG_CRYPTO_MCRYPTD=m
583CONFIG_CRYPTO_TEST=m 587CONFIG_CRYPTO_TEST=m
584CONFIG_CRYPTO_CCM=m
585CONFIG_CRYPTO_CHACHA20POLY1305=m 588CONFIG_CRYPTO_CHACHA20POLY1305=m
586CONFIG_CRYPTO_LRW=m 589CONFIG_CRYPTO_LRW=m
587CONFIG_CRYPTO_PCBC=m 590CONFIG_CRYPTO_PCBC=m
588CONFIG_CRYPTO_KEYWRAP=m 591CONFIG_CRYPTO_KEYWRAP=m
589CONFIG_CRYPTO_CMAC=m
590CONFIG_CRYPTO_XCBC=m 592CONFIG_CRYPTO_XCBC=m
591CONFIG_CRYPTO_VMAC=m 593CONFIG_CRYPTO_VMAC=m
592CONFIG_CRYPTO_MICHAEL_MIC=m 594CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index d0924c22f52a..d1cb7a04ae1d 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -116,6 +116,7 @@ CONFIG_NFT_HASH=m
116CONFIG_NFT_FIB_INET=m 116CONFIG_NFT_FIB_INET=m
117CONFIG_NFT_DUP_NETDEV=m 117CONFIG_NFT_DUP_NETDEV=m
118CONFIG_NFT_FWD_NETDEV=m 118CONFIG_NFT_FWD_NETDEV=m
119CONFIG_NFT_FIB_NETDEV=m
119CONFIG_NETFILTER_XT_SET=m 120CONFIG_NETFILTER_XT_SET=m
120CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 121CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
121CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 122CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -295,6 +296,7 @@ CONFIG_MPLS=y
295CONFIG_NET_MPLS_GSO=m 296CONFIG_NET_MPLS_GSO=m
296CONFIG_MPLS_ROUTING=m 297CONFIG_MPLS_ROUTING=m
297CONFIG_MPLS_IPTUNNEL=m 298CONFIG_MPLS_IPTUNNEL=m
299CONFIG_NET_NSH=m
298CONFIG_NET_L3_MASTER_DEV=y 300CONFIG_NET_L3_MASTER_DEV=y
299CONFIG_AF_KCM=m 301CONFIG_AF_KCM=m
300# CONFIG_WIRELESS is not set 302# CONFIG_WIRELESS is not set
@@ -373,6 +375,7 @@ CONFIG_SUN3LANCE=y
373# CONFIG_NET_VENDOR_ARC is not set 375# CONFIG_NET_VENDOR_ARC is not set
374# CONFIG_NET_CADENCE is not set 376# CONFIG_NET_CADENCE is not set
375# CONFIG_NET_VENDOR_EZCHIP is not set 377# CONFIG_NET_VENDOR_EZCHIP is not set
378# CONFIG_NET_VENDOR_HUAWEI is not set
376CONFIG_SUN3_82586=y 379CONFIG_SUN3_82586=y
377# CONFIG_NET_VENDOR_MARVELL is not set 380# CONFIG_NET_VENDOR_MARVELL is not set
378# CONFIG_NET_VENDOR_MICREL is not set 381# CONFIG_NET_VENDOR_MICREL is not set
@@ -416,6 +419,7 @@ CONFIG_NTP_PPS=y
416CONFIG_PPS_CLIENT_LDISC=m 419CONFIG_PPS_CLIENT_LDISC=m
417CONFIG_PTP_1588_CLOCK=m 420CONFIG_PTP_1588_CLOCK=m
418# CONFIG_HWMON is not set 421# CONFIG_HWMON is not set
422# CONFIG_RC_CORE is not set
419CONFIG_FB=y 423CONFIG_FB=y
420CONFIG_FRAMEBUFFER_CONSOLE=y 424CONFIG_FRAMEBUFFER_CONSOLE=y
421CONFIG_LOGO=y 425CONFIG_LOGO=y
@@ -559,12 +563,10 @@ CONFIG_CRYPTO_USER=m
559CONFIG_CRYPTO_CRYPTD=m 563CONFIG_CRYPTO_CRYPTD=m
560CONFIG_CRYPTO_MCRYPTD=m 564CONFIG_CRYPTO_MCRYPTD=m
561CONFIG_CRYPTO_TEST=m 565CONFIG_CRYPTO_TEST=m
562CONFIG_CRYPTO_CCM=m
563CONFIG_CRYPTO_CHACHA20POLY1305=m 566CONFIG_CRYPTO_CHACHA20POLY1305=m
564CONFIG_CRYPTO_LRW=m 567CONFIG_CRYPTO_LRW=m
565CONFIG_CRYPTO_PCBC=m 568CONFIG_CRYPTO_PCBC=m
566CONFIG_CRYPTO_KEYWRAP=m 569CONFIG_CRYPTO_KEYWRAP=m
567CONFIG_CRYPTO_CMAC=m
568CONFIG_CRYPTO_XCBC=m 570CONFIG_CRYPTO_XCBC=m
569CONFIG_CRYPTO_VMAC=m 571CONFIG_CRYPTO_VMAC=m
570CONFIG_CRYPTO_MICHAEL_MIC=m 572CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 3001ee1e5dc5..ea3a331c62d5 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -116,6 +116,7 @@ CONFIG_NFT_HASH=m
116CONFIG_NFT_FIB_INET=m 116CONFIG_NFT_FIB_INET=m
117CONFIG_NFT_DUP_NETDEV=m 117CONFIG_NFT_DUP_NETDEV=m
118CONFIG_NFT_FWD_NETDEV=m 118CONFIG_NFT_FWD_NETDEV=m
119CONFIG_NFT_FIB_NETDEV=m
119CONFIG_NETFILTER_XT_SET=m 120CONFIG_NETFILTER_XT_SET=m
120CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 121CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
121CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 122CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -295,6 +296,7 @@ CONFIG_MPLS=y
295CONFIG_NET_MPLS_GSO=m 296CONFIG_NET_MPLS_GSO=m
296CONFIG_MPLS_ROUTING=m 297CONFIG_MPLS_ROUTING=m
297CONFIG_MPLS_IPTUNNEL=m 298CONFIG_MPLS_IPTUNNEL=m
299CONFIG_NET_NSH=m
298CONFIG_NET_L3_MASTER_DEV=y 300CONFIG_NET_L3_MASTER_DEV=y
299CONFIG_AF_KCM=m 301CONFIG_AF_KCM=m
300# CONFIG_WIRELESS is not set 302# CONFIG_WIRELESS is not set
@@ -374,6 +376,7 @@ CONFIG_SUN3LANCE=y
374# CONFIG_NET_CADENCE is not set 376# CONFIG_NET_CADENCE is not set
375# CONFIG_NET_VENDOR_BROADCOM is not set 377# CONFIG_NET_VENDOR_BROADCOM is not set
376# CONFIG_NET_VENDOR_EZCHIP is not set 378# CONFIG_NET_VENDOR_EZCHIP is not set
379# CONFIG_NET_VENDOR_HUAWEI is not set
377# CONFIG_NET_VENDOR_INTEL is not set 380# CONFIG_NET_VENDOR_INTEL is not set
378# CONFIG_NET_VENDOR_MARVELL is not set 381# CONFIG_NET_VENDOR_MARVELL is not set
379# CONFIG_NET_VENDOR_MICREL is not set 382# CONFIG_NET_VENDOR_MICREL is not set
@@ -416,6 +419,7 @@ CONFIG_NTP_PPS=y
416CONFIG_PPS_CLIENT_LDISC=m 419CONFIG_PPS_CLIENT_LDISC=m
417CONFIG_PTP_1588_CLOCK=m 420CONFIG_PTP_1588_CLOCK=m
418# CONFIG_HWMON is not set 421# CONFIG_HWMON is not set
422# CONFIG_RC_CORE is not set
419CONFIG_FB=y 423CONFIG_FB=y
420CONFIG_FRAMEBUFFER_CONSOLE=y 424CONFIG_FRAMEBUFFER_CONSOLE=y
421CONFIG_LOGO=y 425CONFIG_LOGO=y
@@ -560,12 +564,10 @@ CONFIG_CRYPTO_USER=m
560CONFIG_CRYPTO_CRYPTD=m 564CONFIG_CRYPTO_CRYPTD=m
561CONFIG_CRYPTO_MCRYPTD=m 565CONFIG_CRYPTO_MCRYPTD=m
562CONFIG_CRYPTO_TEST=m 566CONFIG_CRYPTO_TEST=m
563CONFIG_CRYPTO_CCM=m
564CONFIG_CRYPTO_CHACHA20POLY1305=m 567CONFIG_CRYPTO_CHACHA20POLY1305=m
565CONFIG_CRYPTO_LRW=m 568CONFIG_CRYPTO_LRW=m
566CONFIG_CRYPTO_PCBC=m 569CONFIG_CRYPTO_PCBC=m
567CONFIG_CRYPTO_KEYWRAP=m 570CONFIG_CRYPTO_KEYWRAP=m
568CONFIG_CRYPTO_CMAC=m
569CONFIG_CRYPTO_XCBC=m 571CONFIG_CRYPTO_XCBC=m
570CONFIG_CRYPTO_VMAC=m 572CONFIG_CRYPTO_VMAC=m
571CONFIG_CRYPTO_MICHAEL_MIC=m 573CONFIG_CRYPTO_MICHAEL_MIC=m
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-19 12:41:23 -0400