Clean up the tree from incomplete, unreliable and unsupported IEEE1394 code.

Ok deraadt@, miod@

2 files changed, 2 insertions, 22 deletions

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 886a3c4ee11..eef35bc2815 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.55 2005/02/12 07:18:58 pvalchev Exp $
+#	$OpenBSD: GENERIC,v 1.56 2005/03/05 23:58:43 tdeval Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -134,21 +134,6 @@ radio*	at udsbr?		# USB radio
 #ubt*	at uhub?		# USB Bluetooth
 ugen*	at uhub?		# USB Generic driver
 
-# FireWire Controllers
-#fwohci*	at pci?		# PCI FireWire adapter
-#fwohci*	at cardbus?	# CardBus FireWire adapter
-
-#fwnode*	at fwbus?
-
-#fwscsi*	at fwnode?			# SCSI over FireWire
-#scsibus* at fwscsi?
-
-#option	FWOHCI_DEBUG
-#option	FWNODE_DEBUG
-#option	P1212_DEBUG
-#option	SBP2_DEBUG
-#option	FWSCSI_DEBUG
-
 puc*	at pci?				# PCI "universal" communication device
 
 #isadma0	at isa?
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 70cc07b883d..26d268c614d 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amd64,v 1.7 2004/10/08 13:04:35 grange Exp $
+#	$OpenBSD: files.amd64,v 1.8 2005/03/05 23:58:43 tdeval Exp $
 
 maxpartitions 16
 maxusers 2 16 128
@@ -140,11 +140,6 @@ file	dev/isa/fd.c			fd needs-flag
 include "dev/usb/files.usb"
 
 #
-# FireWire
-#
-include "dev/ieee1394/files.ieee1394"
-
-#
 # device major numbers
 #