summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Belopuhov <mikeb@cvs.openbsd.org>2012-08-03 16:37:20 +0000
committerMike Belopuhov <mikeb@cvs.openbsd.org>2012-08-03 16:37:20 +0000
commit6b20a41aba1dcfd4a390158061888242c2e64b73 (patch)
treed438599921d206ed2cd52679580d7af6bf738aad
parent439c88e9ccc665e0956ba9cd942114e0dea033a2 (diff)
enable oce(4)
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/GENERIC3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index dc08f5eed27..9d92f7fb7f6 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.329 2012/07/09 06:33:18 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.330 2012/08/03 16:37:19 mikeb Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -419,6 +419,7 @@ em* at pci? # Intel Pro/1000 ethernet
ixgb* at pci? # Intel Pro/10Gb ethernet
ix* at pci? # Intel 82598EB 10Gb ethernet
myx* at pci? # Myricom Myri-10G 10Gb ethernet
+oce* at pci? # Emulex OneConnect 10Gb ethernet
txp* at pci? # 3com 3CR990
#nge* at pci? # NS DP83820/DP83821 GigE
bge* at pci? # Broadcom BCM57xx (aka Tigon3)
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 139f00ddde1..c757997cbc1 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.736 2012/07/12 09:45:56 mlarkin Exp $
+# $OpenBSD: GENERIC,v 1.737 2012/08/03 16:37:19 mikeb Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -561,6 +561,7 @@ gcu* at pci? # Intel Pro/1000 ethernet GCU
ixgb* at pci? # Intel Pro/10Gb ethernet
ix* at pci? # Intel 82598EB 10Gb ethernet
myx* at pci? # Myricom Myri-10G 10Gb ethernet
+oce* at pci? # Emulex OneConnect 10Gb ethernet
txp* at pci? # 3com 3CR990
nge* at pci? # NS DP83820/DP83821 GigE
bge* at pci? # Broadcom BCM57xx (aka Tigon3)