Commit 4d686b02 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/defconfig: Update defconfigs for v4.1-rc6 



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

arch/m68k/configs/amiga_defconfig

+6 −2
Original line number Diff line number Diff line
@@ -177,9 +177,9 @@ CONFIG_IP_SET_HASH_NETPORT=m 
CONFIG_IP_SET_HASH_NETIFACE=m

CONFIG_IP_SET_LIST_SET=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m

CONFIG_NFT_REDIR_IPV4=m
@@ -267,7 +267,9 @@ CONFIG_BATMAN_ADV_DAT=y 
CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -285,6 +287,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_PMEM=m

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m
@@ -324,6 +327,7 @@ CONFIG_DM_RAID=m 
CONFIG_DM_ZERO=m

CONFIG_DM_MULTIPATH=m

CONFIG_DM_UEVENT=y

CONFIG_DM_LOG_WRITES=m

CONFIG_TARGET_CORE=m

CONFIG_TCM_IBLOCK=m

CONFIG_TCM_FILEIO=m
@@ -348,6 +352,7 @@ CONFIG_VETH=m 
CONFIG_A2065=y

CONFIG_ARIADNE=y

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CIRRUS is not set

# CONFIG_NET_VENDOR_HP is not set
@@ -414,7 +419,6 @@ CONFIG_HID=m 
CONFIG_HIDRAW=y

CONFIG_UHID=m

# CONFIG_HID_GENERIC is not set

# CONFIG_HID_PLANTRONICS is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_MSM6242=m

arch/m68k/configs/apollo_defconfig

+6 −2
Original line number Diff line number Diff line
@@ -175,9 +175,9 @@ CONFIG_IP_SET_HASH_NETPORT=m 
CONFIG_IP_SET_HASH_NETIFACE=m

CONFIG_IP_SET_LIST_SET=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m

CONFIG_NFT_REDIR_IPV4=m
@@ -265,7 +265,9 @@ CONFIG_BATMAN_ADV_DAT=y 
CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -277,6 +279,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_PMEM=m

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m
@@ -306,6 +309,7 @@ CONFIG_DM_RAID=m 
CONFIG_DM_ZERO=m

CONFIG_DM_MULTIPATH=m

CONFIG_DM_UEVENT=y

CONFIG_DM_LOG_WRITES=m

CONFIG_TARGET_CORE=m

CONFIG_TCM_IBLOCK=m

CONFIG_TCM_FILEIO=m
@@ -327,6 +331,7 @@ CONFIG_NETCONSOLE=m 
CONFIG_NETCONSOLE_DYNAMIC=y

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_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set
@@ -375,7 +380,6 @@ CONFIG_HID=m 
CONFIG_HIDRAW=y

CONFIG_UHID=m

# CONFIG_HID_GENERIC is not set

# CONFIG_HID_PLANTRONICS is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_GENERIC=m

arch/m68k/configs/atari_defconfig

+6 −2
Original line number Diff line number Diff line
@@ -175,9 +175,9 @@ CONFIG_IP_SET_HASH_NETPORT=m 
CONFIG_IP_SET_HASH_NETIFACE=m

CONFIG_IP_SET_LIST_SET=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m

CONFIG_NFT_REDIR_IPV4=m
@@ -265,7 +265,9 @@ CONFIG_BATMAN_ADV_DAT=y 
CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -281,6 +283,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_PMEM=m

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m
@@ -315,6 +318,7 @@ CONFIG_DM_RAID=m 
CONFIG_DM_ZERO=m

CONFIG_DM_MULTIPATH=m

CONFIG_DM_UEVENT=y

CONFIG_DM_LOG_WRITES=m

CONFIG_TARGET_CORE=m

CONFIG_TCM_IBLOCK=m

CONFIG_TCM_FILEIO=m
@@ -337,6 +341,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y 
CONFIG_VETH=m

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_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set
@@ -391,7 +396,6 @@ CONFIG_DMASOUND_ATARI=m 
CONFIG_HID=m

CONFIG_HIDRAW=y

CONFIG_UHID=m

# CONFIG_HID_PLANTRONICS is not set

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_IOMMU_SUPPORT is not set

arch/m68k/configs/bvme6000_defconfig

+6 −2
Original line number Diff line number Diff line
@@ -173,9 +173,9 @@ CONFIG_IP_SET_HASH_NETPORT=m 
CONFIG_IP_SET_HASH_NETIFACE=m

CONFIG_IP_SET_LIST_SET=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m

CONFIG_NFT_REDIR_IPV4=m
@@ -263,7 +263,9 @@ CONFIG_BATMAN_ADV_DAT=y 
CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -275,6 +277,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_PMEM=m

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m
@@ -305,6 +308,7 @@ CONFIG_DM_RAID=m 
CONFIG_DM_ZERO=m

CONFIG_DM_MULTIPATH=m

CONFIG_DM_UEVENT=y

CONFIG_DM_LOG_WRITES=m

CONFIG_TARGET_CORE=m

CONFIG_TCM_IBLOCK=m

CONFIG_TCM_FILEIO=m
@@ -326,6 +330,7 @@ CONFIG_NETCONSOLE=m 
CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_VETH=m

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

CONFIG_BVME6000_NET=y

# CONFIG_NET_VENDOR_MARVELL is not set
@@ -369,7 +374,6 @@ CONFIG_HID=m 
CONFIG_HIDRAW=y

CONFIG_UHID=m

# CONFIG_HID_GENERIC is not set

# CONFIG_HID_PLANTRONICS is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_GENERIC=m

arch/m68k/configs/hp300_defconfig

+6 −2
Original line number Diff line number Diff line
@@ -175,9 +175,9 @@ CONFIG_IP_SET_HASH_NETPORT=m 
CONFIG_IP_SET_HASH_NETIFACE=m

CONFIG_IP_SET_LIST_SET=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_ROUTE_IPV4=m

CONFIG_NF_TABLES_ARP=m

CONFIG_NF_LOG_ARP=m

CONFIG_NFT_CHAIN_NAT_IPV4=m

CONFIG_NFT_MASQ_IPV4=m

CONFIG_NFT_REDIR_IPV4=m
@@ -265,7 +265,9 @@ CONFIG_BATMAN_ADV_DAT=y 
CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m

CONFIG_MPLS_ROUTING=m

# CONFIG_WIRELESS is not set

# CONFIG_UEVENT_HELPER is not set

CONFIG_DEVTMPFS=y
@@ -277,6 +279,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_PMEM=m

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m
@@ -306,6 +309,7 @@ CONFIG_DM_RAID=m 
CONFIG_DM_ZERO=m

CONFIG_DM_MULTIPATH=m

CONFIG_DM_UEVENT=y

CONFIG_DM_LOG_WRITES=m

CONFIG_TARGET_CORE=m

CONFIG_TCM_IBLOCK=m

CONFIG_TCM_FILEIO=m
@@ -328,6 +332,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y 
CONFIG_VETH=m

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_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set
@@ -378,7 +383,6 @@ CONFIG_HID=m 
CONFIG_HIDRAW=y

CONFIG_UHID=m

# CONFIG_HID_GENERIC is not set

# CONFIG_HID_PLANTRONICS is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_GENERIC=m