summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD3
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD4
4 files changed, 10 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 9e6aacd4df9..e17944de883 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.209 2007/12/23 17:44:07 form Exp $
+# $OpenBSD: GENERIC,v 1.210 2007/12/31 19:29:09 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -207,6 +207,7 @@ uath* at uhub? # Atheros AR5005UG/AR5005UX
ural* at uhub? # Ralink RT2500USB
rum* at uhub? # Ralink RT2501USB/RT2601USB
zyd* at uhub? # Zydas ZD1211
+upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB
udcf* at uhub? # Gude Expert mouseCLOCK
uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter
onewire* at uow?
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 68c27e0c93e..d1c7c02c2fe 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.79 2007/12/05 19:17:14 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.80 2007/12/31 19:29:09 deraadt Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -120,6 +120,7 @@ upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network'
ural* at uhub? # Ralink RT2500
rum* at uhub? # Ralink RT2501USB/RT2601USB
zyd* at uhub? # Zydas ZD1211/ZD1211B
+upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 3ec4beb0af9..afdda90298d 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.597 2007/12/23 17:44:07 form Exp $
+# $OpenBSD: GENERIC,v 1.598 2007/12/31 19:29:11 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -262,6 +262,7 @@ uath* at uhub? # Atheros AR5005UG/AR5005UX
ural* at uhub? # Ralink RT2500USB
rum* at uhub? # Ralink RT2501USB/RT2601USB
zyd* at uhub? # Zydas ZD1211
+upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB
#option NATM
#ueagle* at uhub? # Analog Devices Eagle ADSL
udcf* at uhub? # Gude Expert mouseCLOCK
@@ -547,6 +548,7 @@ tht* at thtc?
gem* at pci? # Sun 'gem' ethernet
vic* at pci? # VMware VMXnet virtual interface
et* at pci? # Agere/LSI ET1310
+lii* at pci? # Atheros L2 Ethernet
# Wireless network cards
acx* at pci? # TI ACX100/ACX111 (802.11b/g)
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 70d746b06bc..22e41ed41a7 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.147 2007/12/05 19:17:13 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.148 2007/12/31 19:29:11 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -143,6 +143,7 @@ wi* at uhub? # WaveLAN IEEE 802.11DS
ural* at uhub? # Ralink RT2500
rum* at uhub? # Ralink RT2501USB/RT2601USB
zyd* at uhub? # Zydas ZD1211/ZD1211B
+upgt* at uhub? # Conexant/Intersil PrismGT SoftMAC USB
npx0 at isa? port 0xf0 irq 13 # math coprocessor
isadma0 at isa?
@@ -358,6 +359,7 @@ vge* at pci? # VIA VT612x
nfe* at pci? # NVIDIA nForce Ethernet
xge* at pci? # Neterion Xframe-I/II 10Gb ethernet
vic* at pci? # VMware VMXnet virtual interface
+lii* at pci? # Atheros L2 Ethernet
# Wireless network cards
ath* at pci? # Atheros AR5k (802.11a/b/g)