diff options
| author | dim <dim@FreeBSD.org> | 2016-01-15 17:55:00 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-01-15 17:55:00 +0000 |
| commit | 6b1f1a14c5a8532e9a6ee8c10ba741fcc55896fe (patch) | |
| tree | 402d8f6984826f9801b169f8bc8a5dae20ed1c60 /sys/conf | |
| parent | 8e5c968a84ceadc1d422b13933e1edc45c5372ea (diff) | |
| parent | 5ac53a20e575001384d1acfb426a65ae8c309c24 (diff) | |
| download | FreeBSD-src-6b1f1a14c5a8532e9a6ee8c10ba741fcc55896fe.zip FreeBSD-src-6b1f1a14c5a8532e9a6ee8c10ba741fcc55896fe.tar.gz | |
Merge ^/head r293850 through r294089.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.amd64 | 2 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 0788b46..5944a38 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -273,6 +273,7 @@ dev/hyperv/vmbus/hv_channel.c optional hyperv dev/hyperv/vmbus/hv_channel_mgmt.c optional hyperv dev/hyperv/vmbus/hv_connection.c optional hyperv dev/hyperv/vmbus/hv_hv.c optional hyperv +dev/hyperv/vmbus/hv_et.c optional hyperv dev/hyperv/vmbus/hv_ring_buffer.c optional hyperv dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c optional hyperv dev/nfe/if_nfe.c optional nfe pci @@ -316,6 +317,7 @@ dev/sfxge/common/efx_ev.c optional sfxge pci dev/sfxge/common/efx_filter.c optional sfxge pci dev/sfxge/common/efx_hash.c optional sfxge pci dev/sfxge/common/efx_intr.c optional sfxge pci +dev/sfxge/common/efx_lic.c optional sfxge pci dev/sfxge/common/efx_mac.c optional sfxge pci dev/sfxge/common/efx_mcdi.c optional sfxge pci dev/sfxge/common/efx_mon.c optional sfxge pci diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index ffe272e..334e857 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -247,6 +247,7 @@ dev/hyperv/vmbus/hv_channel.c optional hyperv dev/hyperv/vmbus/hv_channel_mgmt.c optional hyperv dev/hyperv/vmbus/hv_connection.c optional hyperv dev/hyperv/vmbus/hv_hv.c optional hyperv +dev/hyperv/vmbus/hv_et.c optional hyperv dev/hyperv/vmbus/hv_ring_buffer.c optional hyperv dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c optional hyperv dev/ichwd/ichwd.c optional ichwd |
