From bd5fa20d9332b959f7c0e391cc24e5ba394a422b Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 1 Jul 2007 18:22:00 -0300 Subject: [PATCH] --- yaml --- r: 61360 b: refs/heads/master c: 8fb2191a74a0e2a29002c06084e015d33d2ecdda h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/Kconfig | 3 ++- trunk/drivers/media/video/Makefile | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d80bd149c09a..4e9d60896148 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51b540292a349b380ccc0572401c6ac343acdf4a +refs/heads/master: 8fb2191a74a0e2a29002c06084e015d33d2ecdda diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index bb072ab5f09b..9dcbffd0aa15 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/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/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile index 4cddc8cbd341..10b4d4469016 100644 --- a/trunk/drivers/media/video/Makefile +++ b/trunk/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