Merge tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm...

[deliverable/linux.git] / drivers / media / pci / Makefile

diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
index d47c222e69493a9b84744d2a4978a0507cf80a84..35cc57862c01be0df5e34de063a7bc6743496cbf 100644 (file)
--- a/drivers/media/pci/Makefile
+++ b/drivers/media/pci/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-y        :=        ttpci/          \
+obj-y        +=        ttpci/          \
                b2c2/           \
                pluto2/         \
                dm1105/         \
@@ -10,7 +10,8 @@ obj-y        :=       ttpci/          \
                mantis/         \
                ngene/          \
                ddbridge/       \
-               b2c2/
+               b2c2/           \
+               saa7146/
 
 obj-$(CONFIG_VIDEO_IVTV) += ivtv/
 obj-$(CONFIG_VIDEO_ZORAN) += zoran/
@@ -21,3 +22,5 @@ obj-$(CONFIG_VIDEO_CX88) += cx88/
 obj-$(CONFIG_VIDEO_BT848) += bt8xx/
 obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
 obj-$(CONFIG_VIDEO_SAA7164) += saa7164/
+obj-$(CONFIG_VIDEO_MEYE) += meye/
+obj-$(CONFIG_STA2X11_VIP) += sta2x11/