Merge staging-next tree into Linus's latest version

[linux-drm-fsl-dcu.git] / drivers / staging / Makefile

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index d5fdf1349815132045bcd67e7159975b22f8f1fb..e330dd5e843d510178895bca75aed1741e0372a3 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -7,6 +7,7 @@ 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/