diff options
| -rw-r--r-- | sys/conf/files.amd64 | 8 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 8 | ||||
| -rw-r--r-- | sys/dev/hyperv/vmbus/amd64/vmbus_vector.S (renamed from sys/dev/hyperv/vmbus/amd64/hv_vector.S) | 0 | ||||
| -rw-r--r-- | sys/dev/hyperv/vmbus/hyperv.c (renamed from sys/dev/hyperv/vmbus/hv_hv.c) | 0 | ||||
| -rw-r--r-- | sys/dev/hyperv/vmbus/i386/vmbus_vector.S (renamed from sys/dev/hyperv/vmbus/i386/hv_vector.S) | 0 | ||||
| -rw-r--r-- | sys/dev/hyperv/vmbus/vmbus.c (renamed from sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c) | 0 | ||||
| -rw-r--r-- | sys/dev/hyperv/vmbus/vmbus_et.c (renamed from sys/dev/hyperv/vmbus/hv_et.c) | 0 | ||||
| -rw-r--r-- | sys/modules/hyperv/vmbus/Makefile | 13 |
8 files changed, 14 insertions, 15 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index ef356ea..8f0670b 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -273,12 +273,12 @@ dev/hyperv/utilities/hv_util.c optional hyperv 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/hyperv/vmbus/hyperv.c optional hyperv dev/hyperv/vmbus/hyperv_busdma.c optional hyperv -dev/hyperv/vmbus/amd64/hv_vector.S optional hyperv +dev/hyperv/vmbus/vmbus.c optional hyperv +dev/hyperv/vmbus/vmbus_et.c optional hyperv +dev/hyperv/vmbus/amd64/vmbus_vector.S optional hyperv dev/nfe/if_nfe.c optional nfe pci dev/ntb/if_ntb/if_ntb.c optional if_ntb dev/ntb/ntb_hw/ntb_hw.c optional if_ntb | ntb_hw diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index a64a916..ed89ef3 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -248,12 +248,12 @@ dev/hyperv/utilities/hv_util.c optional hyperv 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/hyperv/vmbus/hyperv.c optional hyperv dev/hyperv/vmbus/hyperv_busdma.c optional hyperv -dev/hyperv/vmbus/i386/hv_vector.S optional hyperv +dev/hyperv/vmbus/vmbus.c optional hyperv +dev/hyperv/vmbus/vmbus_et.c optional hyperv +dev/hyperv/vmbus/i386/vmbus_vector.S optional hyperv dev/ichwd/ichwd.c optional ichwd dev/if_ndis/if_ndis.c optional ndis dev/if_ndis/if_ndis_pccard.c optional ndis pccard diff --git a/sys/dev/hyperv/vmbus/amd64/hv_vector.S b/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S index 8d09e24..8d09e24 100644 --- a/sys/dev/hyperv/vmbus/amd64/hv_vector.S +++ b/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S diff --git a/sys/dev/hyperv/vmbus/hv_hv.c b/sys/dev/hyperv/vmbus/hyperv.c index ac18889..ac18889 100644 --- a/sys/dev/hyperv/vmbus/hv_hv.c +++ b/sys/dev/hyperv/vmbus/hyperv.c diff --git a/sys/dev/hyperv/vmbus/i386/hv_vector.S b/sys/dev/hyperv/vmbus/i386/vmbus_vector.S index b9ea849..b9ea849 100644 --- a/sys/dev/hyperv/vmbus/i386/hv_vector.S +++ b/sys/dev/hyperv/vmbus/i386/vmbus_vector.S diff --git a/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c b/sys/dev/hyperv/vmbus/vmbus.c index 6d1445d..6d1445d 100644 --- a/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c +++ b/sys/dev/hyperv/vmbus/vmbus.c diff --git a/sys/dev/hyperv/vmbus/hv_et.c b/sys/dev/hyperv/vmbus/vmbus_et.c index 6e3fbfd..6e3fbfd 100644 --- a/sys/dev/hyperv/vmbus/hv_et.c +++ b/sys/dev/hyperv/vmbus/vmbus_et.c diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile index cfbd2cf..d4c7d8b 100644 --- a/sys/modules/hyperv/vmbus/Makefile +++ b/sys/modules/hyperv/vmbus/Makefile @@ -7,21 +7,20 @@ KMOD= hv_vmbus SRCS= hv_channel.c \ hv_channel_mgmt.c \ hv_connection.c \ - hv_et.c \ - hv_hv.c \ hv_ring_buffer.c \ - hv_vmbus_drv_freebsd.c \ - hv_vmbus_priv.h \ - hyperv_busdma.c + hyperv.c \ + hyperv_busdma.c \ + vmbus.c \ + vmbus_et.c SRCS+= acpi_if.h bus_if.h device_if.h opt_acpi.h # XXX: for assym.s SRCS+= opt_kstack_pages.h opt_nfs.h opt_apic.h opt_hwpmc_hooks.h opt_compat.h SRCS+= assym.s \ - hv_vector.S + vmbus_vector.S -hv_vector.o: +vmbus_vector.o: ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ ${.IMPSRC} -o ${.TARGET} |
