diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 17 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/files.amd64 | 7 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 17 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 7 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 18 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/files.macppc | 7 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/files.sgi | 7 |
7 files changed, 7 insertions, 73 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 # diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 44ddbc46ef1..4c4a412955c 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.403 2005/02/21 16:32:54 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.404 2005/03/05 23:58:43 tdeval Exp $ # # GENERIC -- everything that's currently supported # @@ -176,21 +176,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 npx0 at isa? port 0xf0 irq 13 # math coprocessor diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index cd134a00101..7f37ee63a4d 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.130 2004/10/08 13:04:36 grange Exp $ +# $OpenBSD: files.i386,v 1.131 2005/03/05 23:58:43 tdeval Exp $ # # new style config file for i386 architecture # @@ -388,11 +388,6 @@ attach pccom at cardbus with pccom_cardbus include "dev/usb/files.usb" # -# Machine-independent FireWire drivers -# -include "dev/ieee1394/files.ieee1394" - -# # Machine-independent I2C drivers # include "dev/i2c/files.i2c" diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 15eeab61cb4..f5d16190c16 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.71 2005/02/17 14:40:29 dlg Exp $g +# $OpenBSD: GENERIC,v 1.72 2005/03/05 23:58:43 tdeval Exp $g # # PPC GENERIC config file # @@ -116,22 +116,6 @@ gpio* at gpio? # GPIO, PMU interrupt router. aed* at adb? # ADB Event Device akbd* at adb? # ADB keyboard -# FireWire Controllers -#fwohci* at pci? # PCI FireWire adapter -#fwohci* at cardbus? # CardBus FireWire adapter - -#fw* at fwbus? # IPv4/v6 over FireWire -#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 - wskbd* at akbd? mux 1 ams* at adb? # ADB mouse wsmouse* at ams? mux 0 diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc index d7372103add..ef209d39e91 100644 --- a/sys/arch/macppc/conf/files.macppc +++ b/sys/arch/macppc/conf/files.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: files.macppc,v 1.22 2004/10/08 13:04:36 grange Exp $ +# $OpenBSD: files.macppc,v 1.23 2005/03/05 23:58:43 tdeval Exp $ # # macppc-specific configuration info @@ -232,11 +232,6 @@ include "dev/pcmcia/files.pcmcia" # include "dev/usb/files.usb" -# -# Machine-independent IEEE1394 drivers -# -include "dev/ieee1394/files.ieee1394" - # Sun HME Ethernet controllers device hme: ether, ifnet, mii, ifmedia file dev/ic/hme.c diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi index cb377f7cbf5..101f868d295 100644 --- a/sys/arch/sgi/conf/files.sgi +++ b/sys/arch/sgi/conf/files.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: files.sgi,v 1.7 2005/01/02 19:50:30 kettenis Exp $ +# $OpenBSD: files.sgi,v 1.8 2005/03/05 23:58:43 tdeval Exp $ # # maxpartitions must be first item in files.${ARCH} # @@ -119,11 +119,6 @@ include "dev/wscons/files.wscons" include "dev/usb/files.usb" # -# Machine-independent IEEE1394 drivers -# -include "dev/ieee1394/files.ieee1394" - -# # Specials. # # RAM disk for boot |