summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/i386/conf/GENERIC5
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD5
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index e4a7241f52a..b547b604b92 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.674 2009/11/25 23:12:29 ian Exp $
+# $OpenBSD: GENERIC,v 1.675 2009/11/26 21:15:13 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -604,6 +604,7 @@ sk* at skc? # each port of above
mskc* at pci? # Marvell Yukon-2
msk* at mskc? # each port of above
em* at pci? # Intel Pro/1000 ethernet
+gcu* at pci? # Intel Pro/1000 ethernet GCU
ixgb* at pci? # Intel Pro/10Gb ethernet
ix* at pci? # Intel 82598EB 10Gb ethernet
txp* at pci? # 3com 3CR990
@@ -632,8 +633,6 @@ ale* at pci? # Attansic L1E Ethernet
lii* at pci? # Attansic L2 Ethernet
jme* at pci? # JMicron JMC250/JMC260 Ethernet
-gcu* at pci? # Intel EP80579 auxlliary mii device
-
# Wireless network cards
acx* at pci? # TI ACX100/ACX111 (802.11b/g)
acx* at cardbus? # TI ACX100/ACX111 (802.11b/g)
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index e3c688861e9..e61a6612ed8 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.173 2009/11/25 16:24:16 dms Exp $
+# $OpenBSD: RAMDISK_CD,v 1.174 2009/11/26 21:15:13 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -353,6 +353,7 @@ sk* at skc? # each port of above
mskc* at pci? # Marvell Yukon-2
msk* at mskc? # each port of above
em* at pci? # Intel Pro/1000 ethernet
+gcu* at pci? # Intel EP80579 auxlliary mii device
ixgb* at pci? # Intel Pro/10Gb ethernet
ix* at pci? # Intel 82598EB 10Gb ethernet
txp* at pci? # 3com 3CR990
@@ -377,8 +378,6 @@ ale* at pci? # Attansic L1E Ethernet
lii* at pci? # Attansic L2 Ethernet
jme* at pci? # JMicron JMC250/JMC260 Ethernet
-gcu* at pci? # Intel EP80579 auxlliary mii device
-
# Wireless network cards
acx* at pci? # TI ACX100/ACX111 (802.11b/g)
acx* at cardbus? # TI ACX100/ACX111 (802.11b/g)