summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-12-29 14:44:10 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-12-29 14:44:10 +0000
commite2af9457551e14c7c404fc1696336b4ed676e637 (patch)
treeadd66d81f0be1fd7c49b3733fe60484ae2ded3a0 /sys
parent440badbd73ed1fb0512c8b428f50c7ee4f130500 (diff)
fix a few more locators with ? that snuck in; mickey ok
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/GENERIC6
-rw-r--r--sys/arch/i386/conf/GENERIC4
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 5d868a08220..ff98c072814 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.134 2004/12/19 16:09:16 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.135 2004/12/29 14:44:08 deraadt Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
machine alpha
@@ -308,7 +308,7 @@ scsibus* at atapiscsi?
eap* at pci? # Ensoniq AudioPCI S5016
puc* at pci? # PCI "universal" comm device
-com* at puc? port ?
+com* at puc?
# UNTESTED. The following drivers are untested
eso* at pci? # ESS Solo-1 PCI AudioDrive
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 2c2f45727a1..b3915b503a7 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.45 2004/12/26 01:10:57 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.46 2004/12/29 14:44:09 deraadt Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -243,7 +243,7 @@ uk* at scsibus? # unknown SCSI
# IDE controllers
pciide* at pci? flags 0x0000
-#wdc* at pcmcia? function ?
+#wdc* at pcmcia?
# IDE hard drives
#wd* at wdc? flags 0x0000
@@ -377,7 +377,7 @@ audio* at uaudio?
audio* at yds?
audio* at emu?
-#bktr0 at pci? dev ? function ?
+#bktr0 at pci?
# FM-Radio devices
#gtp* at pci? # Gemtek/Guillemot Radio PCI Radio Card
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 6d485445ebb..37772b41353 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.393 2004/12/29 01:10:28 jsg Exp $
+# $OpenBSD: GENERIC,v 1.394 2004/12/29 14:44:09 deraadt Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -440,7 +440,7 @@ an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
ipw* at pci? # Intel PRO/Wireless 2100
-iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG/2915ABG
+iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
#rtw* at pci? # Realtek 8180
#rtw* at cardbus? # Realtek 8180