diff options
author | Renato Botelho <renato@netgate.com> | 2016-02-19 12:30:07 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-02-19 12:30:07 -0200 |
commit | 0122703298a46bed8c81d6430ffe126414556b51 (patch) | |
tree | 3c9f583a72eca63e3d6148c84bfbe7f3a5fa70e4 /sys/conf | |
parent | b8ac7a6968caff799a8f2b7eaa7b50a44102e35f (diff) | |
parent | 427bb5d10fd29ef038c6a4f6df3160e9c77f1b24 (diff) | |
download | FreeBSD-src-0122703298a46bed8c81d6430ffe126414556b51.zip FreeBSD-src-0122703298a46bed8c81d6430ffe126414556b51.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/files.amd64 | 1 | ||||
-rw-r--r-- | sys/conf/files.i386 | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 445912a..f9080fd 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -275,6 +275,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/kbd/kbd.c optional atkbd | sc | ukbd | vt diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index fb6e4b2..f9816ae 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -253,6 +253,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 |