diff options
author | Adrian Bunk <bunk@stusta.de> | 2007-07-01 17:22:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 13:24:33 -0400 |
commit | 8fb2191a74a0e2a29002c06084e015d33d2ecdda (patch) | |
tree | 9b37410e356447699eb2d8ab2f0e7949282511a6 /drivers/media | |
parent | 51b540292a349b380ccc0572401c6ac343acdf4a (diff) |
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/Kconfig | 3 | ||||
-rw-r--r-- | drivers/media/video/Makefile | 4 |
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 | |||
490 | If in doubt, say N. | 490 | If in doubt, say N. |
491 | 491 | ||
492 | config TUNER_TEA5761 | 492 | config TUNER_TEA5761 |
493 | tristate "TEA 5761 radio tuner (EXPERIMENTAL)" | 493 | bool "TEA 5761 radio tuner (EXPERIMENTAL)" |
494 | depends on EXPERIMENTAL | ||
494 | depends on I2C | 495 | depends on I2C |
495 | select VIDEO_TUNER | 496 | select VIDEO_TUNER |
496 | help | 497 | 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 \ | |||
7 | tuner-objs := tuner-core.o tuner-types.o tuner-simple.o \ | 7 | tuner-objs := tuner-core.o tuner-types.o tuner-simple.o \ |
8 | mt20xx.o tda8290.o tea5767.o tda9887.o | 8 | mt20xx.o tda8290.o tea5767.o tda9887.o |
9 | 9 | ||
10 | ifneq ($(CONFIG_TUNER_TEA5761),) | 10 | tuner-$(CONFIG_TUNER_TEA5761) += tea5761.o |
11 | tuner-objs += tea5761.o | ||
12 | endif | ||
13 | 11 | ||
14 | msp3400-objs := msp3400-driver.o msp3400-kthreads.o | 12 | msp3400-objs := msp3400-driver.o msp3400-kthreads.o |
15 | 13 | ||