summaryrefslogtreecommitdiffstats
path: root/drivers/net/Makefile
diff options
context:
space:
mode:
authorHaiyang Zhang <haiyangz@microsoft.com>2011-11-28 22:35:35 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-29 08:12:36 +0100
commit95fa0405c5991726e06c08ffcd8ff872f7fb4f2d (patch)
treeb03a3a6278d9eb2baab16f45082bdb2ac1a6a183 /drivers/net/Makefile
parentStaging: iio/accel: Changed data type of val in store_measurement_mode to u8 (diff)
downloadlinux-95fa0405c5991726e06c08ffcd8ff872f7fb4f2d.tar.xz
linux-95fa0405c5991726e06c08ffcd8ff872f7fb4f2d.zip
staging: hv: move hv_netvsc out of staging area
hv_netvsc has been reviewed on netdev mailing list on 6/09/2011. All recommended changes have been made. We are requesting to move it out of staging area. Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: KY Srinivasan <kys@microsoft.com> Signed-off-by: Mike Sterling <Mike.Sterling@microsoft.com> Acked-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r--drivers/net/Makefile2
1 files changed, 2 insertions, 0 deletions
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/