From 7af85d9b09728b05095b73bb354b1b09af39369b Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 2 May 2007 10:11:47 -0300 Subject: Use menuconfig objects II - DVB From: Jan Engelhardt Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. Also remove one indirection (CONFIG_DVB) that does not seem to be really used inside the kernel. Signed-off-by: Jan Engelhardt Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/Makefile | 2 +- linux/drivers/media/dvb/Kconfig | 19 ------------------- linux/drivers/media/dvb/dvb-core/Kconfig | 16 +++++++++++++--- 3 files changed, 14 insertions(+), 23 deletions(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/Makefile b/linux/drivers/media/Makefile index c578a529e..8fa19939c 100644 --- a/linux/drivers/media/Makefile +++ b/linux/drivers/media/Makefile @@ -5,4 +5,4 @@ obj-y := common/ obj-$(CONFIG_VIDEO_DEV) += video/ obj-$(CONFIG_VIDEO_DEV) += radio/ -obj-$(CONFIG_DVB) += dvb/ +obj-$(CONFIG_DVB_CORE) += dvb/ diff --git a/linux/drivers/media/dvb/Kconfig b/linux/drivers/media/dvb/Kconfig index a97c8f5e9..525c5184f 100644 --- a/linux/drivers/media/dvb/Kconfig +++ b/linux/drivers/media/dvb/Kconfig @@ -2,23 +2,6 @@ # Multimedia device configuration # -menu "Digital Video Broadcasting Devices" - -config DVB - bool "DVB For Linux" - depends on NET && INET - ---help--- - Support Digital Video Broadcasting hardware. Enable this if you - own a DVB adapter and want to use it or if you compile Linux for - a digital SetTopBox. - - API specs and user tools are available from . - - Please report problems regarding this driver to the LinuxDVB - mailing list. - - If unsure say N. - source "drivers/media/dvb/dvb-core/Kconfig" comment "Supported SAA7146 based PCI Adapters" @@ -47,5 +30,3 @@ source "drivers/media/dvb/pluto2/Kconfig" comment "Supported DVB Frontends" depends on DVB_CORE source "drivers/media/dvb/frontends/Kconfig" - -endmenu diff --git a/linux/drivers/media/dvb/dvb-core/Kconfig b/linux/drivers/media/dvb/dvb-core/Kconfig index 1990eda10..93e24fb0e 100644 --- a/linux/drivers/media/dvb/dvb-core/Kconfig +++ b/linux/drivers/media/dvb/dvb-core/Kconfig @@ -1,12 +1,22 @@ -config DVB_CORE - tristate "DVB Core Support" - depends on DVB +menuconfig DVB_CORE + tristate "DVB for Linux" + depends on NET && INET select CRC32 help + Support Digital Video Broadcasting hardware. Enable this if you + own a DVB adapter and want to use it or if you compile Linux for + a digital SetTopBox. + DVB core utility functions for device handling, software fallbacks etc. Say Y when you have a DVB card and want to use it. Say Y if your want to build your drivers outside the kernel, but need the DVB core. All in-kernel drivers will select this automatically if needed. + + API specs and user tools are available from . + + Please report problems regarding this driver to the LinuxDVB + mailing list. + If unsure say N. config DVB_CORE_ATTACH -- cgit v1.2.3