svn commit: r201443 - in head/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf

[Brooks Davis]

Author: brooks
Date: Sun Jan  3 20:40:54 2010
New Revision: 201443
URL: http://svn.freebsd.org/changeset/base/201443

Log:
  Add vlan(4) to all GENERIC kernels.
  
  MFC after:	1 week

Modified:
  head/sys/amd64/conf/GENERIC
  head/sys/i386/conf/GENERIC
  head/sys/ia64/conf/GENERIC
  head/sys/pc98/conf/GENERIC
  head/sys/powerpc/conf/GENERIC
  head/sys/sparc64/conf/GENERIC
  head/sys/sun4v/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC	Sun Jan  3 20:08:10 2010	(r201442)
+++ head/sys/amd64/conf/GENERIC	Sun Jan  3 20:40:54 2010	(r201443)
@@ -274,6 +274,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: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC	Sun Jan  3 20:08:10 2010	(r201442)
+++ head/sys/i386/conf/GENERIC	Sun Jan  3 20:40:54 2010	(r201443)
@@ -287,6 +287,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: head/sys/ia64/conf/GENERIC
==============================================================================
--- head/sys/ia64/conf/GENERIC	Sun Jan  3 20:08:10 2010	(r201442)
+++ head/sys/ia64/conf/GENERIC	Sun Jan  3 20:40:54 2010	(r201443)
@@ -149,6 +149,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: head/sys/pc98/conf/GENERIC
==============================================================================
--- head/sys/pc98/conf/GENERIC	Sun Jan  3 20:08:10 2010	(r201442)
+++ head/sys/pc98/conf/GENERIC	Sun Jan  3 20:40:54 2010	(r201443)
@@ -241,6 +241,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: head/sys/powerpc/conf/GENERIC
==============================================================================
--- head/sys/powerpc/conf/GENERIC	Sun Jan  3 20:08:10 2010	(r201442)
+++ head/sys/powerpc/conf/GENERIC	Sun Jan  3 20:40:54 2010	(r201443)
@@ -131,6 +131,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: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC	Sun Jan  3 20:08:10 2010	(r201442)
+++ head/sys/sparc64/conf/GENERIC	Sun Jan  3 20:40:54 2010	(r201443)
@@ -216,6 +216,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: head/sys/sun4v/conf/GENERIC
==============================================================================
--- head/sys/sun4v/conf/GENERIC	Sun Jan  3 20:08:10 2010	(r201442)
+++ head/sys/sun4v/conf/GENERIC	Sun Jan  3 20:40:54 2010	(r201443)
@@ -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"