Staging: Merge staging-next into Linus's tree

[net-next-2.6.git] / drivers / staging / Makefile

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index ecfb0bb990b6222d1cc7fcbee550bf6ec1c8856c..ca5c03eb3ce36e233280f7f4bb00ceae5697e4e9 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -23,6 +23,7 @@ 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_DREAM)            += dream/
 obj-$(CONFIG_POHMELFS)         += pohmelfs/
@@ -39,13 +40,12 @@ obj-$(CONFIG_VME_BUS)               += vme/
 obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/
 obj-$(CONFIG_DX_SEP)           += sep/
 obj-$(CONFIG_IIO)              += iio/
-obj-$(CONFIG_RAMZSWAP)         += ramzswap/
+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_DT3155)           += dt3155/
 obj-$(CONFIG_VIDEO_DT3155)     += dt3155v4l/
 obj-$(CONFIG_CRYSTALHD)                += crystalhd/
 obj-$(CONFIG_CXT1E1)           += cxt1e1/
@@ -54,3 +54,7 @@ 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/