svn commit: r202134 - in stable/8/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf

[Brooks Davis]

Author: brooks
Date: Tue Jan 12 06:00:56 2010
New Revision: 202134
URL: http://svn.freebsd.org/changeset/base/202134

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

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

Modified: stable/8/sys/amd64/conf/GENERIC
==============================================================================
--- stable/8/sys/amd64/conf/GENERIC	Tue Jan 12 01:30:05 2010	(r202133)
+++ stable/8/sys/amd64/conf/GENERIC	Tue Jan 12 06:00:56 2010	(r202134)
@@ -265,6 +265,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		tun		# Packet tunnel.
 device		pty		# BSD-style compatibility pseudo ttys
 device		md		# Memory "disks"

Modified: stable/8/sys/i386/conf/GENERIC
==============================================================================
--- stable/8/sys/i386/conf/GENERIC	Tue Jan 12 01:30:05 2010	(r202133)
+++ stable/8/sys/i386/conf/GENERIC	Tue Jan 12 06:00:56 2010	(r202134)
@@ -278,6 +278,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		tun		# Packet tunnel.
 device		pty		# BSD-style compatibility pseudo ttys
 device		md		# Memory "disks"

Modified: stable/8/sys/ia64/conf/GENERIC
==============================================================================
--- stable/8/sys/ia64/conf/GENERIC	Tue Jan 12 01:30:05 2010	(r202133)
+++ stable/8/sys/ia64/conf/GENERIC	Tue Jan 12 06:00:56 2010	(r202134)
@@ -144,6 +144,7 @@ device		kue		# Kawasaki LSI USB Ethernet
 
 # 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/8/sys/pc98/conf/GENERIC
==============================================================================
--- stable/8/sys/pc98/conf/GENERIC	Tue Jan 12 01:30:05 2010	(r202133)
+++ stable/8/sys/pc98/conf/GENERIC	Tue Jan 12 06:00:56 2010	(r202134)
@@ -232,6 +232,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		tun		# Packet tunnel.
 device		pty		# BSD-style compatibility pseudo ttys
 device		md		# Memory "disks"

Modified: stable/8/sys/powerpc/conf/GENERIC
==============================================================================
--- stable/8/sys/powerpc/conf/GENERIC	Tue Jan 12 01:30:05 2010	(r202133)
+++ stable/8/sys/powerpc/conf/GENERIC	Tue Jan 12 06:00:56 2010	(r202134)
@@ -123,6 +123,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		tun		# Packet tunnel.
 device		pty		# BSD-style compatibility pseudo ttys
 device		md		# Memory "disks"

Modified: stable/8/sys/sparc64/conf/GENERIC
==============================================================================
--- stable/8/sys/sparc64/conf/GENERIC	Tue Jan 12 01:30:05 2010	(r202133)
+++ stable/8/sys/sparc64/conf/GENERIC	Tue Jan 12 06:00:56 2010	(r202134)
@@ -207,6 +207,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		tun		# Packet tunnel.
 device		pty		# BSD-style compatibility pseudo ttys
 device		md		# Memory "disks"

Modified: stable/8/sys/sun4v/conf/GENERIC
==============================================================================
--- stable/8/sys/sun4v/conf/GENERIC	Tue Jan 12 01:30:05 2010	(r202133)
+++ stable/8/sys/sun4v/conf/GENERIC	Tue Jan 12 06:00:56 2010	(r202134)
@@ -169,6 +169,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		tun		# Packet tunnel.
 device		pty		# BSD-style compatibility pseudo ttys
 device		md		# Memory "disks"