Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel...

[mv-sheeva.git] / drivers / media / video / saa7134 / Makefile

diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile
index 604158a8c2352b092774e388ea442814fef9ebf8..8a5ff4d3cf15c6c5563d2792ccd23e3aff778515 100644 (file)
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
@@ -1,7 +1,8 @@
 
-saa7134-objs :=        saa7134-cards.o saa7134-core.o saa7134-i2c.o    \
-               saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o    \
-               saa7134-video.o saa7134-input.o
+saa7134-y :=   saa7134-cards.o saa7134-core.o saa7134-i2c.o
+saa7134-y +=   saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o
+saa7134-y +=   saa7134-video.o
+saa7134-$(CONFIG_VIDEO_SAA7134_RC) += saa7134-input.o
 
 obj-$(CONFIG_VIDEO_SAA7134) +=  saa6752hs.o saa7134.o saa7134-empress.o