summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-07-01 18:22:00 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-18 14:24:33 -0300
commit8fb2191a74a0e2a29002c06084e015d33d2ecdda (patch)
tree9b37410e356447699eb2d8ab2f0e7949282511a6 /drivers/media
parent51b540292a349b380ccc0572401c6ac343acdf4a (diff)
downloadlinux-8fb2191a74a0e2a29002c06084e015d33d2ecdda.tar.bz2
V4L/DVB (5813): TUNER_TEA5761 kconfig fixes
The following doesn't make much sense: drivers/media/video/Kconfig: ... config TUNER_TEA5761 tristate "TEA 5761 radio tuner (EXPERIMENTAL)" ... drivers/media/video/Makefile: ... ifneq ($(CONFIG_TUNER_TEA5761),) tuner-objs += tea5761.o endif ... With this setup, TUNER_TEA5761=m is equivalent to TUNER_TEA5761=y. This patch therefore changes TUNER_TEA5761 to a bool. The missing dependency on EXPERIMENTAL the prompt text indicates also gets added by this patch. Additionally, the Makefile entry can now be written in a more compact way. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/Kconfig3
-rw-r--r--drivers/media/video/Makefile4
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index bb072ab5f09b..9dcbffd0aa15 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -490,7 +490,8 @@ config TUNER_3036
If in doubt, say N.
config TUNER_TEA5761
- tristate "TEA 5761 radio tuner (EXPERIMENTAL)"
+ bool "TEA 5761 radio tuner (EXPERIMENTAL)"
+ depends on EXPERIMENTAL
depends on I2C
select VIDEO_TUNER
help
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 4cddc8cbd341..10b4d4469016 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -7,9 +7,7 @@ zr36067-objs := zoran_procfs.o zoran_device.o \
tuner-objs := tuner-core.o tuner-types.o tuner-simple.o \
mt20xx.o tda8290.o tea5767.o tda9887.o
-ifneq ($(CONFIG_TUNER_TEA5761),)
- tuner-objs += tea5761.o
-endif
+tuner-$(CONFIG_TUNER_TEA5761) += tea5761.o
msp3400-objs := msp3400-driver.o msp3400-kthreads.o