Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / media / video / Makefile

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 88c4e0f52bee1c4fb1e4781834a81629b710501b..f07d6916227b5c7b01b045f92bf85e9ca93e7880 100644 (file)
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -139,6 +139,8 @@ obj-$(CONFIG_SOC_CAMERA_MT9V022)    += mt9v022.o
 
 obj-$(CONFIG_VIDEO_AU0828) += au0828/
 
+obj-$(CONFIG_USB_VIDEO_CLASS)  += uvc/
+
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
 EXTRA_CFLAGS += -Idrivers/media/common/tuners