Commit 51fd6276 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/defconfig: Update defconfigs for v4.16-rc5 



Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 55496d3f

arch/m68k/configs/amiga_defconfig

+11 −1
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ CONFIG_NFT_META=m 
CONFIG_NFT_RT=m

CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_FLOW_OFFLOAD=m

CONFIG_NFT_SET_RBTREE=m

CONFIG_NFT_SET_HASH=m

CONFIG_NFT_SET_BITMAP=m
@@ -124,6 +125,8 @@ CONFIG_NFT_FIB_INET=m 
CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -202,6 +205,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m 
CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m
@@ -231,6 +235,7 @@ CONFIG_NF_SOCKET_IPV6=m 
CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m
@@ -244,6 +249,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m 
CONFIG_IP6_NF_MATCH_MH=m

CONFIG_IP6_NF_MATCH_RPFILTER=m

CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_MATCH_SRH=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m
@@ -354,6 +360,7 @@ CONFIG_SCSI_ZORRO7XX=y 
CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_UNSTRIPED=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m
@@ -399,6 +406,7 @@ CONFIG_ARIADNE=y 
# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CIRRUS is not set

# CONFIG_NET_VENDOR_CORTINA is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -416,6 +424,7 @@ CONFIG_ZORRO8390=y 
# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_SOCIONEXT is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set
@@ -474,6 +483,7 @@ CONFIG_RTC_CLASS=y 
# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_MSM6242=m

CONFIG_RTC_DRV_RP5C01=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_HEARTBEAT=y

CONFIG_PROC_HARDWARE=y
@@ -593,7 +603,7 @@ CONFIG_TEST_RHASHTABLE=m 
CONFIG_TEST_HASH=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIND_BIT=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

arch/m68k/configs/apollo_defconfig

+11 −1
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ CONFIG_NFT_META=m 
CONFIG_NFT_RT=m

CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_FLOW_OFFLOAD=m

CONFIG_NFT_SET_RBTREE=m

CONFIG_NFT_SET_HASH=m

CONFIG_NFT_SET_BITMAP=m
@@ -122,6 +123,8 @@ CONFIG_NFT_FIB_INET=m 
CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -200,6 +203,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m 
CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m
@@ -229,6 +233,7 @@ CONFIG_NF_SOCKET_IPV6=m 
CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m
@@ -242,6 +247,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m 
CONFIG_IP6_NF_MATCH_MH=m

CONFIG_IP6_NF_MATCH_RPFILTER=m

CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_MATCH_SRH=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m
@@ -336,6 +342,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m 
CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_UNSTRIPED=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m
@@ -377,6 +384,7 @@ CONFIG_VETH=m 
# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CORTINA is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set
@@ -390,6 +398,7 @@ CONFIG_VETH=m 
# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_NET_VENDOR_SOCIONEXT is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set
@@ -435,6 +444,7 @@ CONFIG_UHID=m 
CONFIG_RTC_CLASS=y

# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_HEARTBEAT=y

CONFIG_PROC_HARDWARE=y
@@ -552,7 +562,7 @@ CONFIG_TEST_RHASHTABLE=m 
CONFIG_TEST_HASH=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIND_BIT=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

arch/m68k/configs/atari_defconfig

+11 −1
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ CONFIG_NFT_META=m 
CONFIG_NFT_RT=m

CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_FLOW_OFFLOAD=m

CONFIG_NFT_SET_RBTREE=m

CONFIG_NFT_SET_HASH=m

CONFIG_NFT_SET_BITMAP=m
@@ -122,6 +123,8 @@ CONFIG_NFT_FIB_INET=m 
CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -200,6 +203,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m 
CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m
@@ -229,6 +233,7 @@ CONFIG_NF_SOCKET_IPV6=m 
CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m
@@ -242,6 +247,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m 
CONFIG_IP6_NF_MATCH_MH=m

CONFIG_IP6_NF_MATCH_RPFILTER=m

CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_MATCH_SRH=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m
@@ -345,6 +351,7 @@ CONFIG_ATARI_SCSI=y 
CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_UNSTRIPED=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m
@@ -387,6 +394,7 @@ CONFIG_ATARILANCE=y 
# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CORTINA is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set
@@ -401,6 +409,7 @@ CONFIG_NE2000=y 
# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

CONFIG_SMC91X=y

# CONFIG_NET_VENDOR_SOCIONEXT is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set
@@ -450,6 +459,7 @@ CONFIG_UHID=m 
CONFIG_RTC_CLASS=y

# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_HEARTBEAT=y

CONFIG_PROC_HARDWARE=y
@@ -574,7 +584,7 @@ CONFIG_TEST_RHASHTABLE=m 
CONFIG_TEST_HASH=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIND_BIT=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

arch/m68k/configs/bvme6000_defconfig

+11 −1
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ CONFIG_NFT_META=m 
CONFIG_NFT_RT=m

CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_FLOW_OFFLOAD=m

CONFIG_NFT_SET_RBTREE=m

CONFIG_NFT_SET_HASH=m

CONFIG_NFT_SET_BITMAP=m
@@ -120,6 +121,8 @@ CONFIG_NFT_FIB_INET=m 
CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -198,6 +201,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m 
CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m
@@ -227,6 +231,7 @@ CONFIG_NF_SOCKET_IPV6=m 
CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m
@@ -240,6 +245,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m 
CONFIG_IP6_NF_MATCH_MH=m

CONFIG_IP6_NF_MATCH_RPFILTER=m

CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_MATCH_SRH=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m
@@ -335,6 +341,7 @@ CONFIG_BVME6000_SCSI=y 
CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_UNSTRIPED=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m
@@ -376,6 +383,7 @@ CONFIG_VETH=m 
# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CORTINA is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

CONFIG_BVME6000_NET=y
@@ -389,6 +397,7 @@ CONFIG_BVME6000_NET=y 
# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_NET_VENDOR_SOCIONEXT is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set
@@ -428,6 +437,7 @@ CONFIG_UHID=m 
CONFIG_RTC_CLASS=y

# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_PROC_HARDWARE=y

CONFIG_EXT4_FS=y
@@ -544,7 +554,7 @@ CONFIG_TEST_RHASHTABLE=m 
CONFIG_TEST_HASH=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIND_BIT=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m

arch/m68k/configs/hp300_defconfig

+11 −1
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ CONFIG_NFT_META=m 
CONFIG_NFT_RT=m

CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_FLOW_OFFLOAD=m

CONFIG_NFT_SET_RBTREE=m

CONFIG_NFT_SET_HASH=m

CONFIG_NFT_SET_BITMAP=m
@@ -122,6 +123,8 @@ CONFIG_NFT_FIB_INET=m 
CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -200,6 +203,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m 
CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m
@@ -229,6 +233,7 @@ CONFIG_NF_SOCKET_IPV6=m 
CONFIG_NFT_CHAIN_ROUTE_IPV6=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_NFT_CHAIN_NAT_IPV6=m

CONFIG_NFT_MASQ_IPV6=m

CONFIG_NFT_REDIR_IPV6=m
@@ -242,6 +247,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m 
CONFIG_IP6_NF_MATCH_MH=m

CONFIG_IP6_NF_MATCH_RPFILTER=m

CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_MATCH_SRH=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m
@@ -336,6 +342,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m 
CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_UNSTRIPED=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m
@@ -378,6 +385,7 @@ CONFIG_HPLANCE=y 
# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CORTINA is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set
@@ -391,6 +399,7 @@ CONFIG_HPLANCE=y 
# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_NET_VENDOR_SOCIONEXT is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set
@@ -438,6 +447,7 @@ CONFIG_UHID=m 
CONFIG_RTC_CLASS=y

# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_PROC_HARDWARE=y

CONFIG_EXT4_FS=y
@@ -554,7 +564,7 @@ CONFIG_TEST_RHASHTABLE=m 
CONFIG_TEST_HASH=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CONFIG_TEST_FIND_BIT=m

CONFIG_FIND_BIT_BENCHMARK=m

CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_TEST_UDELAY=m