summaryrefslogtreecommitdiffstats
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorValentina Manea <valentina.manea.m@gmail.com>2014-08-20 07:31:00 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-08-25 10:40:06 -0700
commit96c2737716d586a218bc795fcb79d2e2b6003081 (patch)
treed2cad517eece7a5ee6255e028f3263c2e0b1e23c /drivers/staging/Makefile
parent588b48caf65c4a92af567948ec0025065e749ddf (diff)
downloadblackbird-op-linux-96c2737716d586a218bc795fcb79d2e2b6003081.tar.gz
blackbird-op-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/staging/Makefile')
-rw-r--r--drivers/staging/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 1e1a3a10faf7..e66a5dbd9b02 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -6,7 +6,6 @@ obj-$(CONFIG_STAGING) += staging.o
obj-y += media/
obj-$(CONFIG_ET131X) += et131x/
obj-$(CONFIG_SLICOSS) += slicoss/
-obj-$(CONFIG_USBIP_CORE) += usbip/
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
obj-$(CONFIG_COMEDI) += comedi/
obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
OpenPOWER on IntegriCloud