Author: brooks
Date: Tue Jan 12 06:04:32 2010
New Revision: 202135
URL: http://svn.freebsd.org/changeset/base/202135

Log:
  MFC r201443:
    Add vlan(4) to all GENERIC kernels.

Modified:
  stable/7/sys/amd64/conf/GENERIC
  stable/7/sys/i386/conf/GENERIC
  stable/7/sys/ia64/conf/GENERIC
  stable/7/sys/pc98/conf/GENERIC
  stable/7/sys/powerpc/conf/GENERIC
  stable/7/sys/sparc64/conf/GENERIC
  stable/7/sys/sun4v/conf/GENERIC
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/conf/GENERIC
==============================================================================
--- stable/7/sys/amd64/conf/GENERIC     Tue Jan 12 06:00:56 2010        
(r202134)
+++ stable/7/sys/amd64/conf/GENERIC     Tue Jan 12 06:04:32 2010        
(r202135)
@@ -254,6 +254,7 @@ device              wi              # 
WaveLAN/Intersil/Symbol 80
 device         loop            # Network loopback
 device         random          # Entropy device
 device         ether           # Ethernet support
+device         vlan            # 802.1Q VLAN support
 device         sl              # Kernel SLIP
 device         ppp             # Kernel PPP
 device         tun             # Packet tunnel.

Modified: stable/7/sys/i386/conf/GENERIC
==============================================================================
--- stable/7/sys/i386/conf/GENERIC      Tue Jan 12 06:00:56 2010        
(r202134)
+++ stable/7/sys/i386/conf/GENERIC      Tue Jan 12 06:04:32 2010        
(r202135)
@@ -268,6 +268,7 @@ device              wi              # 
WaveLAN/Intersil/Symbol 80
 device         loop            # Network loopback
 device         random          # Entropy device
 device         ether           # Ethernet support
+device         vlan            # 802.1Q VLAN support
 device         sl              # Kernel SLIP
 device         ppp             # Kernel PPP
 device         tun             # Packet tunnel.

Modified: stable/7/sys/ia64/conf/GENERIC
==============================================================================
--- stable/7/sys/ia64/conf/GENERIC      Tue Jan 12 06:00:56 2010        
(r202134)
+++ stable/7/sys/ia64/conf/GENERIC      Tue Jan 12 06:04:32 2010        
(r202135)
@@ -143,6 +143,7 @@ device              sbp             # SCSI over FireWire 
(need 
 
 # Various (pseudo) devices
 device         ether           # Ethernet support
+device         vlan            # 802.1Q VLAN support
 device         faith           # IPv6-to-IPv4 relaying (translation)
 device         gif             # IPv6 and IPv4 tunneling
 device         loop            # Network loopback

Modified: stable/7/sys/pc98/conf/GENERIC
==============================================================================
--- stable/7/sys/pc98/conf/GENERIC      Tue Jan 12 06:00:56 2010        
(r202134)
+++ stable/7/sys/pc98/conf/GENERIC      Tue Jan 12 06:04:32 2010        
(r202135)
@@ -222,6 +222,7 @@ device              xe              # Xircom pccard Ethernet
 device         loop            # Network loopback
 device         random          # Entropy device
 device         ether           # Ethernet support
+device         vlan            # 802.1Q VLAN support
 device         sl              # Kernel SLIP
 device         ppp             # Kernel PPP
 device         tun             # Packet tunnel.

Modified: stable/7/sys/powerpc/conf/GENERIC
==============================================================================
--- stable/7/sys/powerpc/conf/GENERIC   Tue Jan 12 06:00:56 2010        
(r202134)
+++ stable/7/sys/powerpc/conf/GENERIC   Tue Jan 12 06:04:32 2010        
(r202135)
@@ -107,6 +107,7 @@ device              fxp             # Intel EtherExpress 
PRO/10
 device         loop            # Network loopback
 device         random          # Entropy device
 device         ether           # Ethernet support
+device         vlan            # 802.1Q VLAN support
 device         sl              # Kernel SLIP
 device         ppp             # Kernel PPP
 device         tun             # Packet tunnel.

Modified: stable/7/sys/sparc64/conf/GENERIC
==============================================================================
--- stable/7/sys/sparc64/conf/GENERIC   Tue Jan 12 06:00:56 2010        
(r202134)
+++ stable/7/sys/sparc64/conf/GENERIC   Tue Jan 12 06:04:32 2010        
(r202135)
@@ -201,6 +201,7 @@ device              ath_rate_sample # SampleRate tx 
 device         loop            # Network loopback
 device         random          # Entropy device
 device         ether           # Ethernet support
+device         vlan            # 802.1Q VLAN support
 device         sl              # Kernel SLIP
 device         ppp             # Kernel PPP
 device         tun             # Packet tunnel.

Modified: stable/7/sys/sun4v/conf/GENERIC
==============================================================================
--- stable/7/sys/sun4v/conf/GENERIC     Tue Jan 12 06:00:56 2010        
(r202134)
+++ stable/7/sys/sun4v/conf/GENERIC     Tue Jan 12 06:04:32 2010        
(r202135)
@@ -156,6 +156,7 @@ device              bge             # Broadcom BCM570xx 
Gigabit
 device         loop            # Network loopback
 device         random          # Entropy device
 device         ether           # Ethernet support
+device         vlan            # 802.1Q VLAN support
 device         sl              # Kernel SLIP
 device         ppp             # Kernel PPP
 device         tun             # Packet tunnel.
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to