V4L/DVB (5599): Use menuconfig objects II - DVB

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 <jengelh@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index c578a529e7a8e910ea969b3fad2c58b28d95ca2d..8fa19939c2b6e5878bdfd29158d92a08be3dccf2 100644 (file)
--- a/drivers/media/Makefile
+++ b/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/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index a97c8f5e9a5d1dc13f6414106e9f75cc7ab9cd09..525c5184f9f7b31709a7de77b1a7bbe9847951a8 100644 (file)
--- a/drivers/media/dvb/Kconfig
+++ b/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 <http://www.linuxtv.org/>.
-
-         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/drivers/media/dvb/dvb-core/Kconfig b/drivers/media/dvb/dvb-core/Kconfig
index 1990eda10c469a52471495d8c865d7fa6d908985..93e24fb0e68e661489c799e6eba1dc07662d8462 100644 (file)
--- a/drivers/media/dvb/dvb-core/Kconfig
+++ b/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 <http://www.linuxtv.org/>.
+
+         Please report problems regarding this driver to the LinuxDVB
+         mailing list.
+
          If unsure say N.
 
 config DVB_CORE_ATTACH