svn commit: r246321 - in stable/9/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf

[Dag-Erling Smørgrav]

Author: des
Date: Mon Feb  4 15:51:27 2013
New Revision: 246321
URL: http://svnweb.freebsd.org/changeset/base/246321

Log:
  MFH (r244992): remove firewire from GENERIC

Modified:
  stable/9/sys/amd64/conf/GENERIC
  stable/9/sys/i386/conf/GENERIC
  stable/9/sys/ia64/conf/GENERIC
  stable/9/sys/pc98/conf/GENERIC
  stable/9/sys/powerpc/conf/GENERIC
  stable/9/sys/sparc64/conf/GENERIC
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/amd64/conf/GENERIC
==============================================================================
--- stable/9/sys/amd64/conf/GENERIC	Mon Feb  4 15:44:42 2013	(r246320)
+++ stable/9/sys/amd64/conf/GENERIC	Mon Feb  4 15:51:27 2013	(r246321)
@@ -331,15 +331,6 @@ device		ural		# Ralink Technology RT2500
 device		urtw		# Realtek RTL8187B/L wireless NICs
 device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
 
-# FireWire support
-device		firewire	# FireWire bus code
-# sbp(4) works for some systems but causes boot failure on others
-#device		sbp		# SCSI over FireWire (Requires scbus and da)
-device		fwe		# Ethernet over FireWire (non-standard!)
-device		fwip		# IP over FireWire (RFC 2734,3146)
-device		dcons		# Dumb console driver
-device		dcons_crom	# Configuration ROM for dcons
-
 # Sound support
 device		sound		# Generic sound driver (required)
 device		snd_cmi		# CMedia CMI8338/CMI8738

Modified: stable/9/sys/i386/conf/GENERIC
==============================================================================
--- stable/9/sys/i386/conf/GENERIC	Mon Feb  4 15:44:42 2013	(r246320)
+++ stable/9/sys/i386/conf/GENERIC	Mon Feb  4 15:51:27 2013	(r246321)
@@ -344,15 +344,6 @@ device		ural		# Ralink Technology RT2500
 device		urtw		# Realtek RTL8187B/L wireless NICs
 device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
 
-# FireWire support
-device		firewire	# FireWire bus code
-# sbp(4) works for some systems but causes boot failure on others
-#device		sbp		# SCSI over FireWire (Requires scbus and da)
-device		fwe		# Ethernet over FireWire (non-standard!)
-device		fwip		# IP over FireWire (RFC 2734,3146)
-device		dcons		# Dumb console driver
-device		dcons_crom	# Configuration ROM for dcons
-
 # Sound support
 device		sound		# Generic sound driver (required)
 device		snd_cmi		# CMedia CMI8338/CMI8738

Modified: stable/9/sys/ia64/conf/GENERIC
==============================================================================
--- stable/9/sys/ia64/conf/GENERIC	Mon Feb  4 15:44:42 2013	(r246320)
+++ stable/9/sys/ia64/conf/GENERIC	Mon Feb  4 15:51:27 2013	(r246321)
@@ -64,7 +64,6 @@ options 	KDB		# Kernel debugger related 
 options 	KDB_TRACE	# Print a stack trace for a panic
 
 # Various "busses"
-device		firewire	# FireWire bus code
 device		miibus		# MII bus support (Ethernet)
 device		pci		# PCI bus support
 device		scbus		# SCSI bus (required for ATA/SCSI)

Modified: stable/9/sys/pc98/conf/GENERIC
==============================================================================
--- stable/9/sys/pc98/conf/GENERIC	Mon Feb  4 15:44:42 2013	(r246320)
+++ stable/9/sys/pc98/conf/GENERIC	Mon Feb  4 15:51:27 2013	(r246321)
@@ -269,7 +269,6 @@ device		bpf		# Berkeley packet filter
 #device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
 
 # FireWire support
-#device		firewire	# FireWire bus code
 #device		sbp		# SCSI over FireWire (Requires scbus and da)
 #device		fwe		# Ethernet over FireWire (non-standard!)
 

Modified: stable/9/sys/powerpc/conf/GENERIC
==============================================================================
--- stable/9/sys/powerpc/conf/GENERIC	Mon Feb  4 15:44:42 2013	(r246320)
+++ stable/9/sys/powerpc/conf/GENERIC	Mon Feb  4 15:51:27 2013	(r246321)
@@ -163,12 +163,6 @@ device		cdce		# Generic USB over Etherne
 device		cue		# CATC USB Ethernet
 device		kue		# Kawasaki LSI USB Ethernet
 
-# FireWire support
-device		firewire	# FireWire bus code
-# sbp(4) works for some systems but causes boot failure on others
-device		sbp		# SCSI over FireWire (Requires scbus and da)
-device		fwe		# Ethernet over FireWire (non-standard!)
-
 # Misc
 device		iicbus		# I2C bus code
 device		kiic		# Keywest I2C

Modified: stable/9/sys/sparc64/conf/GENERIC
==============================================================================
--- stable/9/sys/sparc64/conf/GENERIC	Mon Feb  4 15:44:42 2013	(r246320)
+++ stable/9/sys/sparc64/conf/GENERIC	Mon Feb  4 15:51:27 2013	(r246321)
@@ -253,15 +253,6 @@ device		uath		# Atheros AR5523 wireless 
 device		ural		# Ralink Technology RT2500USB wireless NICs
 device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
 
-# FireWire support
-device		firewire	# FireWire bus code
-# sbp(4) works for some systems but causes boot failure on others
-#device		sbp		# SCSI over FireWire (Requires scbus and da)
-device		fwe		# Ethernet over FireWire (non-standard!)
-device		fwip		# IP over FireWire (RFC 2734,3146)
-device		dcons		# Dumb console driver
-device		dcons_crom	# Configuration ROM for dcons
-
 # Sound support
 device		sound		# Generic sound driver (required)
 device		snd_audiocs	# Crystal Semiconductor CS4231