Commit 44074e89 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: Update defconfigs for v3.15-rc2 



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

arch/m68k/configs/amiga_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ CONFIG_IP_SET_BITMAP_IP=m 
CONFIG_IP_SET_BITMAP_IPMAC=m

CONFIG_IP_SET_BITMAP_PORT=m

CONFIG_IP_SET_HASH_IP=m

CONFIG_IP_SET_HASH_IPMARK=m

CONFIG_IP_SET_HASH_IPPORT=m

CONFIG_IP_SET_HASH_IPPORTIP=m

CONFIG_IP_SET_HASH_IPPORTNET=m
@@ -227,6 +228,7 @@ CONFIG_DNS_RESOLVER=y 
CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV_DAT=y

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_NET_MPLS_GSO=m

# CONFIG_WIRELESS is not set
@@ -279,6 +281,7 @@ CONFIG_DM_CRYPT=m 
CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_CACHE=m

CONFIG_DM_ERA=m

CONFIG_DM_MIRROR=m

CONFIG_DM_RAID=m

CONFIG_DM_ZERO=m
@@ -305,7 +308,6 @@ 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
@@ -315,6 +317,7 @@ CONFIG_ARIADNE=y 
CONFIG_HYDRA=y

CONFIG_APNE=y

CONFIG_ZORRO8390=y

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

arch/m68k/configs/apollo_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ CONFIG_IP_SET_BITMAP_IP=m 
CONFIG_IP_SET_BITMAP_IPMAC=m

CONFIG_IP_SET_BITMAP_PORT=m

CONFIG_IP_SET_HASH_IP=m

CONFIG_IP_SET_HASH_IPMARK=m

CONFIG_IP_SET_HASH_IPPORT=m

CONFIG_IP_SET_HASH_IPPORTIP=m

CONFIG_IP_SET_HASH_IPPORTNET=m
@@ -225,6 +226,7 @@ CONFIG_DNS_RESOLVER=y 
CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV_DAT=y

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_NET_MPLS_GSO=m

# CONFIG_WIRELESS is not set
@@ -261,6 +263,7 @@ CONFIG_DM_CRYPT=m 
CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_CACHE=m

CONFIG_DM_ERA=m

CONFIG_DM_MIRROR=m

CONFIG_DM_RAID=m

CONFIG_DM_ZERO=m
@@ -284,12 +287,12 @@ 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

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

arch/m68k/configs/atari_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ CONFIG_IP_SET_BITMAP_IP=m 
CONFIG_IP_SET_BITMAP_IPMAC=m

CONFIG_IP_SET_BITMAP_PORT=m

CONFIG_IP_SET_HASH_IP=m

CONFIG_IP_SET_HASH_IPMARK=m

CONFIG_IP_SET_HASH_IPPORT=m

CONFIG_IP_SET_HASH_IPPORTIP=m

CONFIG_IP_SET_HASH_IPPORTNET=m
@@ -224,6 +225,7 @@ CONFIG_DNS_RESOLVER=y 
CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV_DAT=y

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_NET_MPLS_GSO=m

# CONFIG_WIRELESS is not set
@@ -269,6 +271,7 @@ CONFIG_DM_CRYPT=m 
CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_CACHE=m

CONFIG_DM_ERA=m

CONFIG_DM_MIRROR=m

CONFIG_DM_RAID=m

CONFIG_DM_ZERO=m
@@ -293,11 +296,11 @@ 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

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

arch/m68k/configs/bvme6000_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ CONFIG_IP_SET_BITMAP_IP=m 
CONFIG_IP_SET_BITMAP_IPMAC=m

CONFIG_IP_SET_BITMAP_PORT=m

CONFIG_IP_SET_HASH_IP=m

CONFIG_IP_SET_HASH_IPMARK=m

CONFIG_IP_SET_HASH_IPPORT=m

CONFIG_IP_SET_HASH_IPPORTIP=m

CONFIG_IP_SET_HASH_IPPORTNET=m
@@ -223,6 +224,7 @@ CONFIG_DNS_RESOLVER=y 
CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV_DAT=y

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_NET_MPLS_GSO=m

# CONFIG_WIRELESS is not set
@@ -260,6 +262,7 @@ CONFIG_DM_CRYPT=m 
CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_CACHE=m

CONFIG_DM_ERA=m

CONFIG_DM_MIRROR=m

CONFIG_DM_RAID=m

CONFIG_DM_ZERO=m
@@ -283,12 +286,12 @@ 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

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

arch/m68k/configs/hp300_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ CONFIG_IP_SET_BITMAP_IP=m 
CONFIG_IP_SET_BITMAP_IPMAC=m

CONFIG_IP_SET_BITMAP_PORT=m

CONFIG_IP_SET_HASH_IP=m

CONFIG_IP_SET_HASH_IPMARK=m

CONFIG_IP_SET_HASH_IPPORT=m

CONFIG_IP_SET_HASH_IPPORTIP=m

CONFIG_IP_SET_HASH_IPPORTNET=m
@@ -225,6 +226,7 @@ CONFIG_DNS_RESOLVER=y 
CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV_DAT=y

CONFIG_BATMAN_ADV_NC=y

CONFIG_BATMAN_ADV_MCAST=y

CONFIG_NETLINK_DIAG=m

CONFIG_NET_MPLS_GSO=m

# CONFIG_WIRELESS is not set
@@ -261,6 +263,7 @@ CONFIG_DM_CRYPT=m 
CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_CACHE=m

CONFIG_DM_ERA=m

CONFIG_DM_MIRROR=m

CONFIG_DM_RAID=m

CONFIG_DM_ZERO=m
@@ -285,12 +288,12 @@ 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

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set