diff options
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/hyperv/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/net/hyperv/Makefile | 3 | ||||
| -rw-r--r-- | drivers/net/hyperv/hyperv_net.h (renamed from drivers/staging/hv/hyperv_net.h) | 0 | ||||
| -rw-r--r-- | drivers/net/hyperv/netvsc.c (renamed from drivers/staging/hv/netvsc.c) | 0 | ||||
| -rw-r--r-- | drivers/net/hyperv/netvsc_drv.c (renamed from drivers/staging/hv/netvsc_drv.c) | 0 | ||||
| -rw-r--r-- | drivers/net/hyperv/rndis_filter.c (renamed from drivers/staging/hv/rndis_filter.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/hv/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/staging/hv/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/TODO | 1 |
11 files changed, 12 insertions, 9 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 654a5e94e0e7..99aa7faf5553 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -338,4 +338,6 @@ config VMXNET3 To compile this driver as a module, choose M here: the module will be called vmxnet3. +source "drivers/net/hyperv/Kconfig" + endif # NETDEVICES diff --git a/drivers/net/Makefile b/drivers/net/Makefile index fa877cd2b139..a81192b902ed 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -66,3 +66,5 @@ obj-$(CONFIG_USB_USBNET) += usb/ obj-$(CONFIG_USB_ZD1201) += usb/ obj-$(CONFIG_USB_IPHETH) += usb/ obj-$(CONFIG_USB_CDC_PHONET) += usb/ + +obj-$(CONFIG_HYPERV_NET) += hyperv/ diff --git a/drivers/net/hyperv/Kconfig b/drivers/net/hyperv/Kconfig new file mode 100644 index 000000000000..936968d23559 --- /dev/null +++ b/drivers/net/hyperv/Kconfig @@ -0,0 +1,5 @@ +config HYPERV_NET + tristate "Microsoft Hyper-V virtual network driver" + depends on HYPERV + help + Select this option to enable the Hyper-V virtual network driver. diff --git a/drivers/net/hyperv/Makefile b/drivers/net/hyperv/Makefile new file mode 100644 index 000000000000..c8a66827100c --- /dev/null +++ b/drivers/net/hyperv/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o + +hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o diff --git a/drivers/staging/hv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index ac1ec8405124..ac1ec8405124 100644 --- a/drivers/staging/hv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h diff --git a/drivers/staging/hv/netvsc.c b/drivers/net/hyperv/netvsc.c index 28e69a6c74a1..28e69a6c74a1 100644 --- a/drivers/staging/hv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 93b0e91cbf98..93b0e91cbf98 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c index bafccb360041..bafccb360041 100644 --- a/drivers/staging/hv/rndis_filter.c +++ b/drivers/net/hyperv/rndis_filter.c diff --git a/drivers/staging/hv/Kconfig b/drivers/staging/hv/Kconfig index 072185ebe95b..8a5116620a9d 100644 --- a/drivers/staging/hv/Kconfig +++ b/drivers/staging/hv/Kconfig @@ -4,12 +4,6 @@ config HYPERV_STORAGE help Select this option to enable the Hyper-V virtual storage driver. -config HYPERV_NET - tristate "Microsoft Hyper-V virtual network driver" - depends on HYPERV && NET - help - Select this option to enable the Hyper-V virtual network driver. - config HYPERV_MOUSE tristate "Microsoft Hyper-V mouse driver" depends on HYPERV && HID diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile index 0f55ceee919b..6c977473189c 100644 --- a/drivers/staging/hv/Makefile +++ b/drivers/staging/hv/Makefile @@ -1,6 +1,4 @@ obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o -obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o obj-$(CONFIG_HYPERV_MOUSE) += hv_mouse.o hv_storvsc-y := storvsc_drv.o -hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o diff --git a/drivers/staging/hv/TODO b/drivers/staging/hv/TODO index ed4d63619df2..fd080cbd6a75 100644 --- a/drivers/staging/hv/TODO +++ b/drivers/staging/hv/TODO @@ -1,5 +1,4 @@ TODO: - - audit the network driver - audit the scsi driver Please send patches for this code to Greg Kroah-Hartman <gregkh@suse.de>, |