Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b6bcb16 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Mauro Carvalho Chehab
Browse files

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: default avatarJan Engelhardt <jengelh@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 910a7b68

drivers/media/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/

drivers/media/dvb/Kconfig

+0 −19
Original line number Diff line number Diff line
@@ -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

drivers/media/dvb/dvb-core/Kconfig

+13 −3
Original line number Diff line number Diff line 
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