diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2013-06-01 01:13:35 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2013-06-01 01:13:35 +0000 |
| commit | 3b5223c1bdf47a92fe6742dfb3cf7c1e155d1f60 (patch) | |
| tree | 314851e551aba4009a962710b3536a2674d5bc29 /sys | |
| parent | b4070dcc74b5b724dc37efae3ed4eec8d7802a60 (diff) | |
Add vmx(4) to the kernel config, but comment it out for now.
ok deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/dev/pci/files.pci | 9 |
3 files changed, 11 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 03bd0bcd66f..dc9cdd0f9b7 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.341 2013/04/05 02:56:17 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.342 2013/06/01 01:13:33 reyk Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -447,6 +447,7 @@ tht* at thtc? gem* at pci? # Sun 'gem' ethernet bce* at pci? # Broadcom BCM4401 vic* at pci? # VMware VMXnet 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 diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 6dbf0465bcb..8ea9751d5aa 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.746 2013/04/05 02:56:15 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.747 2013/06/01 01:13:34 reyk Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -585,6 +585,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 et* at pci? # Agere/LSI ET1310 age* at pci? # Attansic L1 Ethernet alc* at pci? # Attansic L1C/L1D/L2C Ethernet diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci index aebacb85b54..85398a97dcf 100644 --- a/sys/dev/pci/files.pci +++ b/sys/dev/pci/files.pci @@ -1,4 +1,4 @@ -# $OpenBSD: files.pci,v 1.293 2013/01/21 11:17:48 patrick Exp $ +# $OpenBSD: files.pci,v 1.294 2013/06/01 01:13:34 reyk Exp $ # $NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $ # # Config file and device description for machine-independent PCI code. @@ -753,11 +753,16 @@ attach art at musycc file dev/pci/if_art.c art file dev/pci/bt8370.c art -# VMware Virtual NIC +# VMware VMXnet virtual interface device vic: ether, ifnet, ifmedia attach vic at pci file dev/pci/if_vic.c vic +# VMware VMXNET3 virtual interface +device vmx: ether, ifnet, ifmedia +attach vmx at pci +file dev/pci/if_vmx.c vmx + # Atheros L2 Ethernet device lii: ether, ifnet, ifmedia, mii attach lii at pci |