Merge tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[karo-tx-linux.git] / drivers / staging / Makefile

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 17c43c4cacaaa5779c0d64cd021f461f88660d61..76e2ebd596ff3a7221e25599ca1dc8092f148fb6 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -54,10 +54,13 @@ 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/