revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

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

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 2b630f9e31b0946dd56dfe388c9b1b0509859678..e3f1e1b6095e5e790db3b9af1de06e7e29d4f9b7 100755 (executable)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -7,30 +7,27 @@ obj-$(CONFIG_ET131X)          += et131x/
 obj-$(CONFIG_SLICOSS)          += slicoss/
 obj-$(CONFIG_VIDEO_GO7007)     += go7007/
 obj-$(CONFIG_VIDEO_CX25821)    += cx25821/
+obj-$(CONFIG_VIDEO_TM6000)     += tm6000/
+obj-$(CONFIG_LIRC_STAGING)     += lirc/
 obj-$(CONFIG_USB_IP_COMMON)    += usbip/
 obj-$(CONFIG_W35UND)           += winbond/
 obj-$(CONFIG_PRISM2_USB)       += wlan-ng/
 obj-$(CONFIG_ECHO)             += echo/
-obj-$(CONFIG_POCH)             += poch/
 obj-$(CONFIG_OTUS)             += otus/
 obj-$(CONFIG_RT2860)           += rt2860/
 obj-$(CONFIG_RT2870)           += rt2870/
-obj-$(CONFIG_RT3090)           += rt3090/
 obj-$(CONFIG_COMEDI)           += comedi/
 obj-$(CONFIG_ASUS_OLED)                += asus_oled/
 obj-$(CONFIG_PANEL)            += panel/
-obj-$(CONFIG_ALTERA_PCIE_CHDMA)        += altpciechdma/
-obj-$(CONFIG_RTL8187SE)                += rtl8187se/
+obj-$(CONFIG_R8187SE)          += rtl8187se/
 obj-$(CONFIG_RTL8192SU)                += rtl8192su/
+obj-$(CONFIG_RTL8192U)         += rtl8192u/
 obj-$(CONFIG_RTL8192E)         += rtl8192e/
+obj-$(CONFIG_SPECTRA)          += spectra/
 obj-$(CONFIG_TRANZPORT)                += frontier/
-obj-$(CONFIG_ANDROID)          += android/
-obj-$(CONFIG_STAGING_DREAM)    += dream/
-obj-$(CONFIG_DST)              += dst/
+obj-$(CONFIG_DREAM)            += dream/
 obj-$(CONFIG_POHMELFS)         += pohmelfs/
-obj-$(CONFIG_B3DFG)            += b3dfg/
 obj-$(CONFIG_IDE_PHISON)       += phison/
-obj-$(CONFIG_PLAN9AUTH)                += p9auth/
 obj-$(CONFIG_LINE6_USB)                += line6/
 obj-$(CONFIG_USB_SERIAL_QUATECH2)      += serqt_usb2/
 obj-$(CONFIG_USB_SERIAL_QUATECH_USB2)  += quatech_usb2/
@@ -40,8 +37,23 @@ obj-$(CONFIG_VT6656)         += vt6656/
 obj-$(CONFIG_FB_UDL)           += udlfb/
 obj-$(CONFIG_HYPERV)           += hv/
 obj-$(CONFIG_VME_BUS)          += vme/
-obj-$(CONFIG_RAR_REGISTER)     += rar/
-obj-$(CONFIG_DX_SEP)           += sep/
+obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/
 obj-$(CONFIG_IIO)              += iio/
-obj-$(CONFIG_VIVANTE)          += rk29/vivante/
-obj-$(CONFIG_RK29_IPP)         += rk29/ipp/
+obj-$(CONFIG_ZRAM)             += zram/
+obj-$(CONFIG_WLAGS49_H2)       += wlags49_h2/
+obj-$(CONFIG_WLAGS49_H25)      += wlags49_h25/
+obj-$(CONFIG_BATMAN_ADV)       += batman-adv/
+obj-$(CONFIG_SAMSUNG_LAPTOP)   += samsung-laptop/
+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_ADIS16255)                += adis16255/
+obj-$(CONFIG_FB_XGI)           += xgifb/
+obj-$(CONFIG_TOUCHSCREEN_MRSTOUCH)     += mrst-touchscreen/
+obj-$(CONFIG_MSM_STAGING)      += msm/
+obj-$(CONFIG_EASYCAP)          += easycap/
+obj-$(CONFIG_SOLO6X10)         += solo6x10/
+obj-$(CONFIG_TIDSPBRIDGE)      += tidspbridge/
+obj-$(CONFIG_ACPI_QUICKSTART)  += quickstart/