summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2008-06-19 08:16:51 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2008-06-19 08:16:51 +0000
commit9ff6b7150ba8c34cc0ced36885f1f80d250c80bf (patch)
treeeb8ed4040623da705c0737c9ef1aef13e13fc2ce /sys/arch/i386
parent3b6f40137bedbfab0784f7b28ee8f8595671dee4 (diff)
add ix(4) to GENERIC, enable it on i386.
ok deraadt@
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index c82133853b8..755966dced4 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.625 2008/06/17 16:01:41 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.626 2008/06/19 08:16:50 reyk Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -553,6 +553,7 @@ mskc* at pci? # Marvell Yukon-2
msk* at mskc? # each port of above
em* at pci? # Intel Pro/1000 ethernet
ixgb* at pci? # Intel Pro/10Gb ethernet
+ix* at pci? # Intel 82598EB 10Gb ethernet
txp* at pci? # 3com 3CR990
nge* at pci? # NS DP83820/DP83821 GigE
bge* at pci? # Broadcom BCM57xx (aka Tigon3)