aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/m68k/configs/amiga_defconfig12
-rw-r--r--arch/m68k/configs/apollo_defconfig12
-rw-r--r--arch/m68k/configs/atari_defconfig12
-rw-r--r--arch/m68k/configs/bvme6000_defconfig12
-rw-r--r--arch/m68k/configs/hp300_defconfig12
-rw-r--r--arch/m68k/configs/mac_defconfig12
-rw-r--r--arch/m68k/configs/multi_defconfig12
-rw-r--r--arch/m68k/configs/mvme147_defconfig12
-rw-r--r--arch/m68k/configs/mvme16x_defconfig12
-rw-r--r--arch/m68k/configs/q40_defconfig12
-rw-r--r--arch/m68k/configs/sun3_defconfig12
-rw-r--r--arch/m68k/configs/sun3x_defconfig12
12 files changed, 132 insertions, 12 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 52fa7fbdefa2..37a8e5ab8728 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -105,6 +105,7 @@ CONFIG_NFT_META=m
105CONFIG_NFT_RT=m 105CONFIG_NFT_RT=m
106CONFIG_NFT_NUMGEN=m 106CONFIG_NFT_NUMGEN=m
107CONFIG_NFT_CT=m 107CONFIG_NFT_CT=m
108CONFIG_NFT_FLOW_OFFLOAD=m
108CONFIG_NFT_SET_RBTREE=m 109CONFIG_NFT_SET_RBTREE=m
109CONFIG_NFT_SET_HASH=m 110CONFIG_NFT_SET_HASH=m
110CONFIG_NFT_SET_BITMAP=m 111CONFIG_NFT_SET_BITMAP=m
@@ -124,6 +125,8 @@ CONFIG_NFT_FIB_INET=m
124CONFIG_NFT_DUP_NETDEV=m 125CONFIG_NFT_DUP_NETDEV=m
125CONFIG_NFT_FWD_NETDEV=m 126CONFIG_NFT_FWD_NETDEV=m
126CONFIG_NFT_FIB_NETDEV=m 127CONFIG_NFT_FIB_NETDEV=m
128CONFIG_NF_FLOW_TABLE_INET=m
129CONFIG_NF_FLOW_TABLE=m
127CONFIG_NETFILTER_XT_SET=m 130CONFIG_NETFILTER_XT_SET=m
128CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 131CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
129CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 132CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -202,6 +205,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
202CONFIG_NFT_DUP_IPV4=m 205CONFIG_NFT_DUP_IPV4=m
203CONFIG_NFT_FIB_IPV4=m 206CONFIG_NFT_FIB_IPV4=m
204CONFIG_NF_TABLES_ARP=m 207CONFIG_NF_TABLES_ARP=m
208CONFIG_NF_FLOW_TABLE_IPV4=m
205CONFIG_NF_LOG_ARP=m 209CONFIG_NF_LOG_ARP=m
206CONFIG_NFT_CHAIN_NAT_IPV4=m 210CONFIG_NFT_CHAIN_NAT_IPV4=m
207CONFIG_NFT_MASQ_IPV4=m 211CONFIG_NFT_MASQ_IPV4=m
@@ -231,6 +235,7 @@ CONFIG_NF_SOCKET_IPV6=m
231CONFIG_NFT_CHAIN_ROUTE_IPV6=m 235CONFIG_NFT_CHAIN_ROUTE_IPV6=m
232CONFIG_NFT_DUP_IPV6=m 236CONFIG_NFT_DUP_IPV6=m
233CONFIG_NFT_FIB_IPV6=m 237CONFIG_NFT_FIB_IPV6=m
238CONFIG_NF_FLOW_TABLE_IPV6=m
234CONFIG_NFT_CHAIN_NAT_IPV6=m 239CONFIG_NFT_CHAIN_NAT_IPV6=m
235CONFIG_NFT_MASQ_IPV6=m 240CONFIG_NFT_MASQ_IPV6=m
236CONFIG_NFT_REDIR_IPV6=m 241CONFIG_NFT_REDIR_IPV6=m
@@ -244,6 +249,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
244CONFIG_IP6_NF_MATCH_MH=m 249CONFIG_IP6_NF_MATCH_MH=m
245CONFIG_IP6_NF_MATCH_RPFILTER=m 250CONFIG_IP6_NF_MATCH_RPFILTER=m
246CONFIG_IP6_NF_MATCH_RT=m 251CONFIG_IP6_NF_MATCH_RT=m
252CONFIG_IP6_NF_MATCH_SRH=m
247CONFIG_IP6_NF_TARGET_HL=m 253CONFIG_IP6_NF_TARGET_HL=m
248CONFIG_IP6_NF_FILTER=m 254CONFIG_IP6_NF_FILTER=m
249CONFIG_IP6_NF_TARGET_REJECT=m 255CONFIG_IP6_NF_TARGET_REJECT=m
@@ -354,6 +360,7 @@ CONFIG_SCSI_ZORRO7XX=y
354CONFIG_MD=y 360CONFIG_MD=y
355CONFIG_MD_LINEAR=m 361CONFIG_MD_LINEAR=m
356CONFIG_BLK_DEV_DM=m 362CONFIG_BLK_DEV_DM=m
363CONFIG_DM_UNSTRIPED=m
357CONFIG_DM_CRYPT=m 364CONFIG_DM_CRYPT=m
358CONFIG_DM_SNAPSHOT=m 365CONFIG_DM_SNAPSHOT=m
359CONFIG_DM_THIN_PROVISIONING=m 366CONFIG_DM_THIN_PROVISIONING=m
@@ -399,6 +406,7 @@ CONFIG_ARIADNE=y
399# CONFIG_NET_CADENCE is not set 406# CONFIG_NET_CADENCE is not set
400# CONFIG_NET_VENDOR_BROADCOM is not set 407# CONFIG_NET_VENDOR_BROADCOM is not set
401# CONFIG_NET_VENDOR_CIRRUS is not set 408# CONFIG_NET_VENDOR_CIRRUS is not set
409# CONFIG_NET_VENDOR_CORTINA is not set
402# CONFIG_NET_VENDOR_EZCHIP is not set 410# CONFIG_NET_VENDOR_EZCHIP is not set
403# CONFIG_NET_VENDOR_HP is not set 411# CONFIG_NET_VENDOR_HP is not set
404# CONFIG_NET_VENDOR_HUAWEI is not set 412# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -416,6 +424,7 @@ CONFIG_ZORRO8390=y
416# CONFIG_NET_VENDOR_SEEQ is not set 424# CONFIG_NET_VENDOR_SEEQ is not set
417# CONFIG_NET_VENDOR_SOLARFLARE is not set 425# CONFIG_NET_VENDOR_SOLARFLARE is not set
418# CONFIG_NET_VENDOR_SMSC is not set 426# CONFIG_NET_VENDOR_SMSC is not set
427# CONFIG_NET_VENDOR_SOCIONEXT is not set
419# CONFIG_NET_VENDOR_STMICRO is not set 428# CONFIG_NET_VENDOR_STMICRO is not set
420# CONFIG_NET_VENDOR_VIA is not set 429# CONFIG_NET_VENDOR_VIA is not set
421# CONFIG_NET_VENDOR_WIZNET is not set 430# CONFIG_NET_VENDOR_WIZNET is not set
@@ -474,6 +483,7 @@ CONFIG_RTC_CLASS=y
474# CONFIG_RTC_NVMEM is not set 483# CONFIG_RTC_NVMEM is not set
475CONFIG_RTC_DRV_MSM6242=m 484CONFIG_RTC_DRV_MSM6242=m
476CONFIG_RTC_DRV_RP5C01=m 485CONFIG_RTC_DRV_RP5C01=m
486# CONFIG_VIRTIO_MENU is not set
477# CONFIG_IOMMU_SUPPORT is not set 487# CONFIG_IOMMU_SUPPORT is not set
478CONFIG_HEARTBEAT=y 488CONFIG_HEARTBEAT=y
479CONFIG_PROC_HARDWARE=y 489CONFIG_PROC_HARDWARE=y
@@ -593,7 +603,7 @@ CONFIG_TEST_RHASHTABLE=m
593CONFIG_TEST_HASH=m 603CONFIG_TEST_HASH=m
594CONFIG_TEST_USER_COPY=m 604CONFIG_TEST_USER_COPY=m
595CONFIG_TEST_BPF=m 605CONFIG_TEST_BPF=m
596CONFIG_TEST_FIND_BIT=m 606CONFIG_FIND_BIT_BENCHMARK=m
597CONFIG_TEST_FIRMWARE=m 607CONFIG_TEST_FIRMWARE=m
598CONFIG_TEST_SYSCTL=m 608CONFIG_TEST_SYSCTL=m
599CONFIG_TEST_UDELAY=m 609CONFIG_TEST_UDELAY=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index b00fe19e1c04..6a466266b852 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -103,6 +103,7 @@ CONFIG_NFT_META=m
103CONFIG_NFT_RT=m 103CONFIG_NFT_RT=m
104CONFIG_NFT_NUMGEN=m 104CONFIG_NFT_NUMGEN=m
105CONFIG_NFT_CT=m 105CONFIG_NFT_CT=m
106CONFIG_NFT_FLOW_OFFLOAD=m
106CONFIG_NFT_SET_RBTREE=m 107CONFIG_NFT_SET_RBTREE=m
107CONFIG_NFT_SET_HASH=m 108CONFIG_NFT_SET_HASH=m
108CONFIG_NFT_SET_BITMAP=m 109CONFIG_NFT_SET_BITMAP=m
@@ -122,6 +123,8 @@ CONFIG_NFT_FIB_INET=m
122CONFIG_NFT_DUP_NETDEV=m 123CONFIG_NFT_DUP_NETDEV=m
123CONFIG_NFT_FWD_NETDEV=m 124CONFIG_NFT_FWD_NETDEV=m
124CONFIG_NFT_FIB_NETDEV=m 125CONFIG_NFT_FIB_NETDEV=m
126CONFIG_NF_FLOW_TABLE_INET=m
127CONFIG_NF_FLOW_TABLE=m
125CONFIG_NETFILTER_XT_SET=m 128CONFIG_NETFILTER_XT_SET=m
126CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 129CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
127CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 130CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -200,6 +203,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
200CONFIG_NFT_DUP_IPV4=m 203CONFIG_NFT_DUP_IPV4=m
201CONFIG_NFT_FIB_IPV4=m 204CONFIG_NFT_FIB_IPV4=m
202CONFIG_NF_TABLES_ARP=m 205CONFIG_NF_TABLES_ARP=m
206CONFIG_NF_FLOW_TABLE_IPV4=m
203CONFIG_NF_LOG_ARP=m 207CONFIG_NF_LOG_ARP=m
204CONFIG_NFT_CHAIN_NAT_IPV4=m 208CONFIG_NFT_CHAIN_NAT_IPV4=m
205CONFIG_NFT_MASQ_IPV4=m 209CONFIG_NFT_MASQ_IPV4=m
@@ -229,6 +233,7 @@ CONFIG_NF_SOCKET_IPV6=m
229CONFIG_NFT_CHAIN_ROUTE_IPV6=m 233CONFIG_NFT_CHAIN_ROUTE_IPV6=m
230CONFIG_NFT_DUP_IPV6=m 234CONFIG_NFT_DUP_IPV6=m
231CONFIG_NFT_FIB_IPV6=m 235CONFIG_NFT_FIB_IPV6=m
236CONFIG_NF_FLOW_TABLE_IPV6=m
232CONFIG_NFT_CHAIN_NAT_IPV6=m 237CONFIG_NFT_CHAIN_NAT_IPV6=m
233CONFIG_NFT_MASQ_IPV6=m 238CONFIG_NFT_MASQ_IPV6=m
234CONFIG_NFT_REDIR_IPV6=m 239CONFIG_NFT_REDIR_IPV6=m
@@ -242,6 +247,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
242CONFIG_IP6_NF_MATCH_MH=m 247CONFIG_IP6_NF_MATCH_MH=m
243CONFIG_IP6_NF_MATCH_RPFILTER=m 248CONFIG_IP6_NF_MATCH_RPFILTER=m
244CONFIG_IP6_NF_MATCH_RT=m 249CONFIG_IP6_NF_MATCH_RT=m
250CONFIG_IP6_NF_MATCH_SRH=m
245CONFIG_IP6_NF_TARGET_HL=m 251CONFIG_IP6_NF_TARGET_HL=m
246CONFIG_IP6_NF_FILTER=m 252CONFIG_IP6_NF_FILTER=m
247CONFIG_IP6_NF_TARGET_REJECT=m 253CONFIG_IP6_NF_TARGET_REJECT=m
@@ -336,6 +342,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
336CONFIG_MD=y 342CONFIG_MD=y
337CONFIG_MD_LINEAR=m 343CONFIG_MD_LINEAR=m
338CONFIG_BLK_DEV_DM=m 344CONFIG_BLK_DEV_DM=m
345CONFIG_DM_UNSTRIPED=m
339CONFIG_DM_CRYPT=m 346CONFIG_DM_CRYPT=m
340CONFIG_DM_SNAPSHOT=m 347CONFIG_DM_SNAPSHOT=m
341CONFIG_DM_THIN_PROVISIONING=m 348CONFIG_DM_THIN_PROVISIONING=m
@@ -377,6 +384,7 @@ CONFIG_VETH=m
377# CONFIG_NET_VENDOR_ARC is not set 384# CONFIG_NET_VENDOR_ARC is not set
378# CONFIG_NET_CADENCE is not set 385# CONFIG_NET_CADENCE is not set
379# CONFIG_NET_VENDOR_BROADCOM is not set 386# CONFIG_NET_VENDOR_BROADCOM is not set
387# CONFIG_NET_VENDOR_CORTINA is not set
380# CONFIG_NET_VENDOR_EZCHIP is not set 388# CONFIG_NET_VENDOR_EZCHIP is not set
381# CONFIG_NET_VENDOR_HUAWEI is not set 389# CONFIG_NET_VENDOR_HUAWEI is not set
382# CONFIG_NET_VENDOR_INTEL is not set 390# CONFIG_NET_VENDOR_INTEL is not set
@@ -390,6 +398,7 @@ CONFIG_VETH=m
390# CONFIG_NET_VENDOR_SAMSUNG is not set 398# CONFIG_NET_VENDOR_SAMSUNG is not set
391# CONFIG_NET_VENDOR_SEEQ is not set 399# CONFIG_NET_VENDOR_SEEQ is not set
392# CONFIG_NET_VENDOR_SOLARFLARE is not set 400# CONFIG_NET_VENDOR_SOLARFLARE is not set
401# CONFIG_NET_VENDOR_SOCIONEXT is not set
393# CONFIG_NET_VENDOR_STMICRO is not set 402# CONFIG_NET_VENDOR_STMICRO is not set
394# CONFIG_NET_VENDOR