summaryrefslogtreecommitdiffstats
path: root/drivers/usb/Makefile
diff options
context:
space:
mode:
authorValentina Manea2014-08-20 06:31:00 +0200
committerGreg Kroah-Hartman2014-08-25 19:40:06 +0200
commit96c2737716d586a218bc795fcb79d2e2b6003081 (patch)
treed2cad517eece7a5ee6255e028f3263c2e0b1e23c /drivers/usb/Makefile
parentusbip: move usbip userspace code out of staging (diff)
downloadkernel-qcow2-linux-96c2737716d586a218bc795fcb79d2e2b6003081.tar.gz
kernel-qcow2-linux-96c2737716d586a218bc795fcb79d2e2b6003081.tar.xz
kernel-qcow2-linux-96c2737716d586a218bc795fcb79d2e2b6003081.zip
usbip: move usbip kernel code out of staging
At this point, USB/IP kernel code is fully functional and can be moved out of staging. Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/Makefile')
-rw-r--r--drivers/usb/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 3cba892b83a2..d7be71778059 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -60,3 +60,5 @@ obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs/
obj-$(CONFIG_USB_GADGET) += gadget/
obj-$(CONFIG_USB_COMMON) += common/
+
+obj-$(CONFIG_USBIP_CORE) += usbip/