diff options
| author | Renato Botelho <renato@netgate.com> | 2016-05-09 17:39:43 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-05-09 17:39:43 -0300 |
| commit | 20ab79d9560e0036f834689a67c3035c18e3eb43 (patch) | |
| tree | ee1296285669938e8ca9f3215719c5e461aab23b /sys/amd64/conf | |
| parent | 394097451eda898069e18b8dc01759b5ec2d19ff (diff) | |
| parent | 751248c9f444f5d00818a67a793dc0319749f236 (diff) | |
| download | FreeBSD-src-20ab79d9560e0036f834689a67c3035c18e3eb43.zip FreeBSD-src-20ab79d9560e0036f834689a67c3035c18e3eb43.tar.gz | |
Merge remote-tracking branch 'origin/master' into devel-11
Diffstat (limited to 'sys/amd64/conf')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/amd64/conf/NOTES | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 272da43..2859de5 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -102,6 +102,7 @@ device cpufreq device acpi options ACPI_DMAR device pci +options PCI_HP # PCI-Express native HotPlug options PCI_IOV # PCI SR-IOV support # Floppy drives @@ -349,7 +350,7 @@ device virtio_blk # VirtIO Block device device virtio_scsi # VirtIO SCSI device device virtio_balloon # VirtIO Memory Balloon device -# HyperV drivers and enchancement support +# HyperV drivers and enhancement support device hyperv # HyperV drivers # Xen HVM Guest Optimizations diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 604a1a3..4107ca6 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -509,7 +509,7 @@ device virtio_balloon # VirtIO Memory Balloon device device virtio_random # VirtIO Entropy device device virtio_console # VirtIO Console device -# Microsoft Hyper-V enchancement support +# Microsoft Hyper-V enhancement support device hyperv # HyperV drivers # Xen HVM Guest Optimizations |
