summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2013-09-08 02:53:41 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2013-09-08 02:53:41 +0000
commit3c13b1cb496d3302788d8f8cddc47bc3b9cd9fcc (patch)
tree7b81002027273510a8908abbd00c553644c38ed4 /sys/arch/i386/conf/GENERIC
parent9e91ce04e2b0d45a4eecca81923cc556977047c2 (diff)
Enable vmx(4) on i386 and amd64.
It will be enabled by default in the GENERIC and RAMDISK_CD kernels, but you have to set vmxnet3 in the VMware configuration on the host; see vmx(4). ok deraadt@
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index c149721eb73..70f2e76bc69 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.754 2013/09/05 19:42:07 sasano Exp $
+# $OpenBSD: GENERIC,v 1.755 2013/09/08 02:53:39 reyk Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -583,7 +583,7 @@ thtc* at pci? # Tehuti Networks 10Gb ethernet
tht* at thtc?
gem* at pci? # Sun 'gem' ethernet
vic* at pci? # VMware VMXnet virtual interface
-#vmx* at pci? # VMware VMXNET3 virtual interface
+vmx* at pci? # VMware VMXNET3 virtual interface
et* at pci? # Agere/LSI ET1310
age* at pci? # Attansic L1 Ethernet
alc* at pci? # Attansic L1C/L1D/L2C Ethernet