1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index ff7372d25c9..3b223cbf86b 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -29,14 +29,13 @@ obj-$(CONFIG_R8187SE)		+= rtl8187se/
 obj-$(CONFIG_RTL8192U)          += rtl8192u/
 obj-$(CONFIG_RTL8192E)          += rtl8192e/
 obj-$(CONFIG_R8712U)            += rtl8712/
+obj-$(CONFIG_RTS_PSTOR)         += rts_pstor/
 obj-$(CONFIG_SPECTRA)           += spectra/
 obj-$(CONFIG_TRANZPORT)         += frontier/
 obj-$(CONFIG_POHMELFS)          += pohmelfs/
-obj-$(CONFIG_AUTOFS_FS)         += autofs/
 obj-$(CONFIG_IDE_PHISON)        += phison/
 obj-$(CONFIG_LINE6_USB)         += line6/
 obj-$(CONFIG_USB_SERIAL_QUATECH2)       += serqt_usb2/
-obj-$(CONFIG_SMB_FS)            += smbfs/
 obj-$(CONFIG_USB_SERIAL_QUATECH_USB2)   += quatech_usb2/
 obj-$(CONFIG_OCTEON_ETHERNET)   += octeon/
 obj-$(CONFIG_VT6655)            += vt6655/
@@ -48,6 +47,8 @@ obj-$(CONFIG_DX_SEP)            += sep/
 obj-$(CONFIG_IIO)               += iio/
 obj-$(CONFIG_CS5535_GPIO)       += cs5535_gpio/
 obj-$(CONFIG_ZRAM)              += zram/
+obj-$(CONFIG_XVMALLOC)          += zram/
+obj-$(CONFIG_ZCACHE)            += zcache/
 obj-$(CONFIG_WLAGS49_H2)        += wlags49_h2/
 obj-$(CONFIG_WLAGS49_H25)       += wlags49_h25/
 obj-$(CONFIG_SAMSUNG_LAPTOP)    += samsung-laptop/
@@ -55,7 +56,6 @@ obj-$(CONFIG_FB_SM7XX)		+= sm7xx/
 obj-$(CONFIG_VIDEO_DT3155)      += dt3155v4l/
 obj-$(CONFIG_CRYSTALHD)         += crystalhd/
 obj-$(CONFIG_CXT1E1)            += cxt1e1/
-obj-$(CONFIG_TI_ST)             += ti-st/
 obj-$(CONFIG_FB_XGI)            += xgifb/
 obj-$(CONFIG_MSM_STAGING)       += msm/
 obj-$(CONFIG_EASYCAP)           += easycap/
@@ -63,12 +63,13 @@ obj-$(CONFIG_SOLO6X10)		+= solo6x10/
 obj-$(CONFIG_TIDSPBRIDGE)       += tidspbridge/
 obj-$(CONFIG_ACPI_QUICKSTART)   += quickstart/
 obj-$(CONFIG_WESTBRIDGE_ASTORIA)        += westbridge/astoria/
-obj-$(CONFIG_SBE_2T3E3) += sbe-2t3e3/
+obj-$(CONFIG_SBE_2T3E3)         += sbe-2t3e3/
 obj-$(CONFIG_ATH6K_LEGACY)      += ath6kl/
 obj-$(CONFIG_USB_ENESTORAGE)    += keucr/
-obj-$(CONFIG_BCM_WIMAX) += bcm/
+obj-$(CONFIG_BCM_WIMAX)         += bcm/
 obj-$(CONFIG_FT1000)            += ft1000/
-obj-$(CONFIG_SND_INTEL_SST)             += intel_sst/
-obj-$(CONFIG_SPEAKUP)   += speakup/
+obj-$(CONFIG_SND_INTEL_SST)     += intel_sst/
+obj-$(CONFIG_SPEAKUP)           += speakup/
 obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)       += cptm1217/
 obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)    += ste_rmi4/
+obj-$(CONFIG_DRM_PSB)           += gma500/