Merge git://git.infradead.org/users/dwmw2/spectra-2.6 into work

[pandora-kernel.git] / drivers / staging / Makefile

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 2e2f96e..6d21710 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -7,11 +7,11 @@ 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_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/
@@ -37,6 +37,7 @@ obj-$(CONFIG_FB_UDL)          += udlfb/
 obj-$(CONFIG_HYPERV)           += hv/
 obj-$(CONFIG_VME_BUS)          += vme/
 obj-$(CONFIG_RAR_REGISTER)     += rar_register/
+obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/
 obj-$(CONFIG_DX_SEP)           += sep/
 obj-$(CONFIG_IIO)              += iio/
 obj-$(CONFIG_RAMZSWAP)         += ramzswap/
@@ -44,11 +45,13 @@ 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_STRIP)            += strip/
-obj-$(CONFIG_ARLAN)            += arlan/
-obj-$(CONFIG_WAVELAN)          += wavelan/
-obj-$(CONFIG_PCMCIA_WAVELAN)   += wavelan/
-obj-$(CONFIG_PCMCIA_NETWAVE)   += netwave/
 obj-$(CONFIG_FB_SM7XX)         += sm7xx/
 obj-$(CONFIG_DT3155)           += dt3155/
+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/