summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-03-30 13:00:45 -0400
committerMichael Krufky <mkrufky@linuxtv.org>2008-03-30 13:00:45 -0400
commit7de80935f4a24094229ebd0d7949c90ff99a56c6 (patch)
tree9596fc1b7626e1ba91a55f7083bb5fd46a17cf5b /linux/drivers/media/video
parentc0ab1d905923c64bad96a2de8ffb1377345a532c (diff)
downloadmediapointer-dvb-s2-7de80935f4a24094229ebd0d7949c90ff99a56c6.tar.gz
mediapointer-dvb-s2-7de80935f4a24094229ebd0d7949c90ff99a56c6.tar.bz2
tuner-simple: fix broken build dependency
From: Michael Krufky <mkrufky@linuxtv.org> tuner-simple is the only module that uses tuner-types - these will be merged to a single module in the future. For now, build both of them if TUNER_SIMPLE is selected. This fixes the following build warning, if tuner-simple is selected without tuner-types: WARNING: "tuner_count" [tuner-simple.ko] undefined! WARNING: "tuners" [tuner-simple.ko] undefined! Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index a03f06c74..53d4dbf50 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/drivers/media/video/Makefile
@@ -85,10 +85,11 @@ obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
obj-$(CONFIG_TUNER_3036) += tuner-3036.o
obj-$(CONFIG_VIDEO_TUNER) += tuner.o
-obj-$(CONFIG_VIDEO_TUNER_TYPES) += tuner-types.o
obj-$(CONFIG_TUNER_XC2028) += tuner-xc2028.o
obj-$(CONFIG_TUNER_SIMPLE) += tuner-simple.o
+# tuner-types will be merged into tuner-simple, in the future
+obj-$(CONFIG_TUNER_SIMPLE) += tuner-types.o
obj-$(CONFIG_TUNER_MT20XX) += mt20xx.o
obj-$(CONFIG_TUNER_TDA8290) += tda8290.o
obj-$(CONFIG_TUNER_TEA5767) += tea5767.o