Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw

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

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 3be59d02cae4b22a3c1f5351e8a8b0bdc9d039a1..c7ec486680f7f460226bae0444e16db604d9fc79 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_R8187SE)         += rtl8187se/
 obj-$(CONFIG_RTL8192U)         += rtl8192u/
 obj-$(CONFIG_RTL8192E)         += rtl8192e/
 obj-$(CONFIG_R8712U)           += rtl8712/
-obj-$(CONFIG_RTS_PSTOR)                += rts_pstor/
 obj-$(CONFIG_RTS5139)          += rts5139/
 obj-$(CONFIG_TRANZPORT)                += frontier/
 obj-$(CONFIG_IDE_PHISON)       += phison/
@@ -29,7 +28,6 @@ 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/
@@ -53,10 +51,15 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)        += ste_rmi4/
 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/
 obj-$(CONFIG_CSR_WIFI)         += csr/
 obj-$(CONFIG_OMAP_BANDGAP)     += omap-thermal/
+obj-$(CONFIG_ZCACHE2)          += ramster/
+obj-$(CONFIG_NET_VENDOR_SILICOM)       += silicom/
+obj-$(CONFIG_CED1401)          += ced1401/
+obj-$(CONFIG_DRM_IMX)          += imx-drm/
+obj-$(CONFIG_DGRP)             += dgrp/
+obj-$(CONFIG_SB105X)           += sb105x/
+obj-$(CONFIG_FIREWIRE_SERIAL)  += fwserial/