summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2006-01-05 20:04:46 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2006-01-05 20:04:46 +0000
commit7068db9c11510ecad69b9f2a81ee8806cf76f645 (patch)
tree38e920a50acc0817a551dc2f3c49fb785983c482 /sys/arch
parent1c41613d17c834c274cf8633dcb6bc3fa2366da2 (diff)
enable ixgb
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD8
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index c5965587410..3cf34b27428 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.457 2006/01/05 08:54:27 grange Exp $
+# $OpenBSD: GENERIC,v 1.458 2006/01/05 20:04:10 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -456,7 +456,7 @@ ti* at pci? # Alteon Tigon 1Gb ethernet
skc* at pci? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
em* at pci? # Intel Pro/1000 ethernet
-#ixgb* at pci? # Intel Pro/10Gb ethernet
+ixgb* at pci? # Intel Pro/10Gb ethernet
txp* at pci? # 3com 3CR990
nge* at pci? # NS DP83820/DP83821 GigE
bge* at pci? # Broadcom BCM570x (aka Tigon3)
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 8b906cc5e5c..7e1bbad071c 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.108 2005/11/15 03:08:25 brad Exp $
+# $OpenBSD: RAMDISK_CD,v 1.109 2006/01/05 20:04:45 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -196,8 +196,8 @@ dpt* at eisa? # DPT SmartCache/SmartRAID EISA
scsibus* at dpt?
gdt* at pci? # ICP Vortex GDT RAID controllers
scsibus* at gdt?
-#aac* at pci? # Adaptec FSA RAID controllers
-#scsibus* at aac?
+aac* at pci? # Adaptec FSA RAID controllers
+scsibus* at aac?
ami* at pci? # AMI MegaRAID controllers
scsibus* at ami?
cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers
@@ -323,7 +323,7 @@ ti* at pci? # Alteon Tigon 1Gb ethernet
skc* at pci? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
em* at pci? # Intel Pro/1000 ethernet
-#ixgb* at pci? # Intel Pro/10Gb ethernet
+ixgb* at pci? # Intel Pro/10Gb ethernet
txp* at pci? # 3com 3CR990
nge* at pci? # NS DP83820/DP83821 GigE
re* at pci? # Realtek 8169/8169S/8110S