Merge commit 'v3.5-rc2' into next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / Makefile

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index ffe7d44374e606cf770f87ca46a5ad8f45753592..a987b3ad380be083ea133ce77db0538cd212f787 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -3,8 +3,8 @@
 # fix for build system bug...
 obj-$(CONFIG_STAGING)          += staging.o
 
-obj-y                          += serial/
 obj-y                          += media/
+obj-y                          += net/
 obj-$(CONFIG_ET131X)           += et131x/
 obj-$(CONFIG_SLICOSS)          += slicoss/
 obj-$(CONFIG_USBIP_CORE)       += usbip/
@@ -25,11 +25,11 @@ obj-$(CONFIG_TRANZPORT)             += frontier/
 obj-$(CONFIG_IDE_PHISON)       += phison/
 obj-$(CONFIG_LINE6_USB)                += line6/
 obj-$(CONFIG_USB_SERIAL_QUATECH2)      += serqt_usb2/
-obj-$(CONFIG_USB_SERIAL_QUATECH_USB2)  += quatech_usb2/
 obj-$(CONFIG_OCTEON_ETHERNET)  += octeon/
 obj-$(CONFIG_VT6655)           += vt6655/
 obj-$(CONFIG_VT6656)           += vt6656/
 obj-$(CONFIG_VME_BUS)          += vme/
+obj-$(CONFIG_IPACK_BUS)                += ipack/
 obj-$(CONFIG_DX_SEP)            += sep/
 obj-$(CONFIG_IIO)              += iio/
 obj-$(CONFIG_ZRAM)             += zram/
@@ -50,10 +50,11 @@ obj-$(CONFIG_FT1000)                += ft1000/
 obj-$(CONFIG_SPEAKUP)          += speakup/
 obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)      += cptm1217/
 obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)   += ste_rmi4/
-obj-$(CONFIG_INTEL_MEI)                += mei/
 obj-$(CONFIG_MFD_NVEC)         += nvec/
 obj-$(CONFIG_DRM_OMAP)         += omapdrm/
 obj-$(CONFIG_ANDROID)          += android/
 obj-$(CONFIG_PHONE)            += telephony/
 obj-$(CONFIG_RAMSTER)          += ramster/
 obj-$(CONFIG_USB_WPAN_HCD)     += ozwpan/
+obj-$(CONFIG_USB_G_CCG)                += ccg/
+obj-$(CONFIG_WIMAX_GDM72XX)    += gdm72xx/