Acasă Explorează Ajutor
Autentificare
GfA
/
linux_kernel
5
0
Bifurcare 0
Fisiere Probleme 0 Trageți solicitările 0 Wiki
Răsfoiți Sursa

m68k: Update defconfigs for v3.15-rc2

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Geert Uytterhoeven 11 ani în urmă
părinte
83adc18110
comite
44074e892c
12 a modificat fișierele cu 48 adăugiri și 12 ștergeri
Vizualizare divizată Arată Statisticile Diff
  1. 4 1
      arch/m68k/configs/amiga_defconfig
  2. 4 1
      arch/m68k/configs/apollo_defconfig
  3. 4 1
      arch/m68k/configs/atari_defconfig
  4. 4 1
      arch/m68k/configs/bvme6000_defconfig
  5. 4 1
      arch/m68k/configs/hp300_defconfig
  6. 4 1
      arch/m68k/configs/mac_defconfig
  7. 4 1
      arch/m68k/configs/multi_defconfig
  8. 4 1
      arch/m68k/configs/mvme147_defconfig
  9. 4 1
      arch/m68k/configs/mvme16x_defconfig
  10. 4 1
      arch/m68k/configs/q40_defconfig
  11. 4 1
      arch/m68k/configs/sun3_defconfig
  12. 4 1
      arch/m68k/configs/sun3x_defconfig

+ 4 - 1
arch/m68k/configs/amiga_defconfig
Vizualizați fișierul 

@@ -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

+ 4 - 1
arch/m68k/configs/apollo_defconfig
Vizualizați fișierul 

@@ -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

+ 4 - 1
arch/m68k/configs/atari_defconfig
Vizualizați fișierul 

@@ -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

+ 4 - 1
arch/m68k/configs/bvme6000_defconfig
Vizualizați fișierul 

@@ -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

+ 4 - 1
arch/m68k/configs/hp300_defconfig
Vizualizați fișierul 

@@ -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

+ 4 - 1
arch/m68k/configs/mac_defconfig
Vizualizați fișierul 

@@ -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
 
@@ -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
 
@@ -270,6 +272,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
 
@@ -301,7 +304,6 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
 CONFIG_MACMACE=y
 
 # CONFIG_NET_VENDOR_ARC is not set
 
-# CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_BROADCOM is not set
 
 CONFIG_MAC89x0=y
 
 # CONFIG_NET_VENDOR_INTEL is not set
 
@@ -309,6 +311,7 @@ CONFIG_MAC89x0=y
 
 # CONFIG_NET_VENDOR_MICREL is not set
 
 CONFIG_MACSONIC=y
 
 CONFIG_MAC8390=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

+ 4 - 1
arch/m68k/configs/multi_defconfig
Vizualizați fișierul 

@@ -165,6 +165,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
 
@@ -236,6 +237,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
 
@@ -302,6 +304,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
 
@@ -340,7 +343,6 @@ CONFIG_MVME147_NET=y
 
 CONFIG_SUN3LANCE=y
 
 CONFIG_MACMACE=y
 
 # CONFIG_NET_VENDOR_ARC is not set
 
-# CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_BROADCOM is not set
 
 CONFIG_MAC89x0=y
 
 # CONFIG_NET_VENDOR_HP is not set
 
@@ -354,6 +356,7 @@ CONFIG_MAC8390=y
 
 CONFIG_NE2000=m
 
 CONFIG_APNE=y
 
 CONFIG_ZORRO8390=y
 
+# 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

+ 4 - 1
arch/m68k/configs/mvme147_defconfig
Vizualizați fișierul 

@@ -154,6 +154,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
 
@@ -222,6 +223,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
 
@@ -259,6 +261,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_DYNAMIC=y
 
 CONFIG_VETH=m
 
 CONFIG_MVME147_NET=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

+ 4 - 1
arch/m68k/configs/mvme16x_defconfig
Vizualizați fișierul 

@@ -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_MVME16x_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

+ 4 - 1
arch/m68k/configs/q40_defconfig
Vizualizați fișierul 

@@ -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
 
@@ -266,6 +268,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
 
@@ -291,7 +294,6 @@ CONFIG_VETH=m
 
 # CONFIG_NET_VENDOR_3COM is not set
 
 # CONFIG_NET_VENDOR_AMD is not set
 
 # 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
 
@@ -299,6 +301,7 @@ CONFIG_VETH=m
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
 # CONFIG_NET_VENDOR_MICREL is not set
 
 CONFIG_NE2000=m
 
+# 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

+ 4 - 1
arch/m68k/configs/sun3_defconfig
Vizualizați fișierul 

@@ -152,6 +152,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
 
@@ -220,6 +221,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
 
@@ -257,6 +259,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
 
@@ -281,11 +284,11 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
 CONFIG_SUN3LANCE=y
 
 # CONFIG_NET_VENDOR_ARC is not set
 
-# CONFIG_NET_CADENCE is not set
 
 CONFIG_SUN3_82586=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_SUN is not set

+ 4 - 1
arch/m68k/configs/sun3x_defconfig
Vizualizați fișierul 

@@ -152,6 +152,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
 
@@ -220,6 +221,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
 
@@ -257,6 +259,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
 
@@ -281,12 +284,12 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
 CONFIG_SUN3LANCE=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