diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2008-03-30 13:00:45 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2008-03-30 13:00:45 -0400 |
| commit | 7de80935f4a24094229ebd0d7949c90ff99a56c6 (patch) | |
| tree | 9596fc1b7626e1ba91a55f7083bb5fd46a17cf5b /linux | |
| parent | c0ab1d905923c64bad96a2de8ffb1377345a532c (diff) | |
| download | mediapointer-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')
| -rw-r--r-- | linux/drivers/media/Kconfig | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/Makefile | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig index b9b38d9ff..1f7244cff 100644 --- a/linux/drivers/media/Kconfig +++ b/linux/drivers/media/Kconfig @@ -71,13 +71,9 @@ source "drivers/media/dvb/Kconfig" source "drivers/media/common/Kconfig" -config VIDEO_TUNER_TYPES - tristate - config VIDEO_TUNER tristate depends on I2C - select VIDEO_TUNER_TYPES select TUNER_XC2028 if !VIDEO_TUNER_CUSTOMIZE select TUNER_MT20XX if !VIDEO_TUNER_CUSTOMIZE select TUNER_TDA8290 if !VIDEO_TUNER_CUSTOMIZE @@ -140,7 +136,6 @@ config TUNER_TEA5767 config TUNER_SIMPLE tristate "Simple tuner support" depends on I2C - select VIDEO_TUNER_TYPES select TUNER_TDA9887 default m if VIDEO_TUNER_CUSTOMIZE help 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 |