V4L/DVB: saa7134-input can't be a module right now

There are some symbols at saa7134-input that are used on saa7134
and vice-versa. Due to that, module install fails.

So, partially revert commit 9f495cf7d691c99bf7bdcec9f35fcfdad2cf9ae9.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile
index 562446800f0e..8a5ff4d3cf15 100644
--- a/drivers/media/video/saa7134/Makefile
+++ b/drivers/media/video/saa7134/Makefile
@@ -1,9 +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-rc-objs := 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
 
@@ -11,8 +10,6 @@ obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o
 
 obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
 
-obj-$(CONFIG_VIDEO_SAA7134_RC) += saa7134-rc.o
-
 EXTRA_CFLAGS += -Idrivers/media/video
 EXTRA_CFLAGS += -Idrivers/media/common/tuners
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core