Index: amd64/conf/GENERIC
===================================================================
--- amd64/conf/GENERIC	(revision 241722)
+++ amd64/conf/GENERIC	(working copy)
@@ -317,15 +317,6 @@
 device		ukbd		# Keyboard
 device		umass		# Disks/Mass storage - Requires scbus and da
 
-# 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
Index: i386/conf/GENERIC
===================================================================
--- i386/conf/GENERIC	(revision 241722)
+++ i386/conf/GENERIC	(working copy)
@@ -331,15 +331,6 @@
 device		ukbd		# Keyboard
 device		umass		# Disks/Mass storage - Requires scbus and da
 
-# 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
Index: ia64/conf/GENERIC
===================================================================
--- ia64/conf/GENERIC	(revision 241722)
+++ ia64/conf/GENERIC	(working copy)
@@ -77,7 +77,6 @@
 options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 
 # 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)
Index: pc98/conf/GENERIC
===================================================================
--- pc98/conf/GENERIC	(revision 241722)
+++ pc98/conf/GENERIC	(working copy)
@@ -270,7 +270,6 @@
 #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!)
 
Index: powerpc/conf/GENERIC
===================================================================
--- powerpc/conf/GENERIC	(revision 241722)
+++ powerpc/conf/GENERIC	(working copy)
@@ -180,12 +180,6 @@
 options		IEEE80211_SUPPORT_MESH
 options		AH_SUPPORT_AR5416
 
-# 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
Index: sparc64/conf/GENERIC
===================================================================
--- sparc64/conf/GENERIC	(revision 241722)
+++ sparc64/conf/GENERIC	(working copy)
@@ -238,15 +238,6 @@
 device		ukbd		# Keyboard
 device		umass		# Disks/Mass storage - Requires scbus and da
 
-# 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