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

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



Change Kconfig objects from "menu, config" into "menuconfig" so
that the user can disable the whole feature without having to
enter the menu first.

Signed-off-by: default avatarJan Engelhardt <jengelh@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 480b55c2

drivers/media/radio/Kconfig

+7 −2
Original line number Diff line number Diff line
@@ -2,8 +2,12 @@ 
# Multimedia Video device configuration

#



menu "Radio Adapters"

menuconfig RADIO_ADAPTERS

	bool "Radio Adapters"

	depends on VIDEO_DEV

	default y



if RADIO_ADAPTERS



config RADIO_CADET

	tristate "ADS Cadet AM/FM Tuner"
@@ -328,4 +332,5 @@ config USB_DSBR 


	  To compile this driver as a module, choose M here: the

	  module will be called dsbr100.

endmenu
 


endif # RADIO_ADAPTERS

drivers/media/video/Kconfig

+23 −18
Original line number Diff line number Diff line
@@ -2,14 +2,15 @@ 
# Multimedia Video device configuration

#



menu "Video Capture Adapters"

menuconfig VIDEO_CAPTURE_DRIVERS

	bool "Video capture adapters"

	depends on VIDEO_DEV

	default y



comment "Video Capture Adapters"

if VIDEO_CAPTURE_DRIVERS



config VIDEO_ADV_DEBUG

	bool "Enable advanced debug functionality"

	depends on VIDEO_DEV

	default n

	---help---

	  Say Y here to enable advanced debugging functionality on some
@@ -34,7 +35,7 @@ config VIDEO_HELPER_CHIPS_AUTO 
#



menu "Encoders/decoders and other helper chips"

	depends on VIDEO_DEV && !VIDEO_HELPER_CHIPS_AUTO

	depends on !VIDEO_HELPER_CHIPS_AUTO



comment "Audio decoders"
@@ -61,7 +62,7 @@ config VIDEO_TDA7432 


config VIDEO_TDA9840

	tristate "Philips TDA9840 audio processor"

	depends on VIDEO_DEV && I2C

	depends on I2C

	---help---

	  Support for tda9840 audio decoder chip found on some Zoran boards.
@@ -79,7 +80,7 @@ config VIDEO_TDA9875 


config VIDEO_TEA6415C

	tristate "Philips TEA6415C audio processor"

	depends on VIDEO_DEV && I2C

	depends on I2C

	---help---

	  Support for tea6415c audio decoder chip found on some bt8xx boards.
@@ -88,7 +89,7 @@ config VIDEO_TEA6415C 


config VIDEO_TEA6420

	tristate "Philips TEA6420 audio processor"

	depends on VIDEO_DEV && I2C

	depends on I2C

	---help---

	  Support for tea6420 audio decoder chip found on some bt8xx boards.
@@ -469,7 +470,7 @@ config VIDEO_SAA5246A 


config VIDEO_SAA5249

	tristate "SAA5249 Teletext processor"

	depends on VIDEO_DEV && I2C && VIDEO_V4L2

	depends on I2C && VIDEO_V4L2

	help

	  Support for I2C bus based teletext using the SAA5249 chip. At the

	  moment this is only useful on some European WinTV cards.
@@ -479,7 +480,7 @@ config VIDEO_SAA5249 


config TUNER_3036

	tristate "SAB3036 tuner"

	depends on VIDEO_DEV && I2C && VIDEO_V4L1

	depends on I2C && VIDEO_V4L1

	help

	  Say Y here to include support for Philips SAB3036 compatible tuners.

	  If in doubt, say N.
@@ -681,8 +682,12 @@ config VIDEO_CAFE_CCIC 
# USB Multimedia device configuration

#



menu "V4L USB devices"

	depends on USB && VIDEO_DEV

menuconfig V4L_USB_DRIVERS

	bool "V4L USB devices"

	depends on USB

	default y



if V4L_USB_DRIVERS



source "drivers/media/video/pvrusb2/Kconfig"
@@ -707,7 +712,7 @@ config VIDEO_OVCAMCHIP 


config USB_W9968CF

	tristate "USB W996[87]CF JPEG Dual Mode Camera support"

	depends on USB && VIDEO_V4L1 && I2C

	depends on VIDEO_V4L1 && I2C

	select VIDEO_OVCAMCHIP

	---help---

	  Say Y here if you want support for cameras based on OV681 or
@@ -725,7 +730,7 @@ config USB_W9968CF 


config USB_OV511

	tristate "USB OV511 Camera support"

	depends on USB && VIDEO_V4L1

	depends on VIDEO_V4L1

	---help---

	  Say Y here if you want to connect this type of camera to your

	  computer's USB port. See <file:Documentation/video4linux/ov511.txt>
@@ -736,7 +741,7 @@ config USB_OV511 


config USB_SE401

	tristate "USB SE401 Camera support"

	depends on USB && VIDEO_V4L1

	depends on VIDEO_V4L1

	---help---

	  Say Y here if you want to connect this type of camera to your

	  computer's USB port. See <file:Documentation/video4linux/se401.txt>
@@ -749,7 +754,7 @@ source "drivers/media/video/sn9c102/Kconfig" 


config USB_STV680

	tristate "USB STV680 (Pencam) Camera support"

	depends on USB && VIDEO_V4L1

	depends on VIDEO_V4L1

	---help---

	  Say Y here if you want to connect this type of camera to your

	  computer's USB port. This includes the Pencam line of cameras.
@@ -765,7 +770,7 @@ source "drivers/media/video/pwc/Kconfig" 


config USB_ZR364XX

	tristate "USB ZR364XX Camera support"

	depends on USB && VIDEO_V4L2

	depends on VIDEO_V4L2

	---help---

	  Say Y here if you want to connect this type of camera to your

	  computer's USB port.
@@ -775,6 +780,6 @@ config USB_ZR364XX 
	  To compile this driver as a module, choose M here: the

	  module will be called zr364xx.



endmenu # V4L USB devices

endif # V4L_USB_DRIVERS



endmenu
 
endif # VIDEO_CAPTURE_DRIVERS

drivers/media/video/em28xx/Kconfig

+1 −1
Original line number Diff line number Diff line 
config VIDEO_EM28XX

	tristate "Empia EM2800/2820/2840 USB video capture support"

	depends on VIDEO_V4L1 && USB && I2C

	depends on VIDEO_V4L1 && I2C

	select VIDEO_BUF

	select VIDEO_TUNER

	select VIDEO_TVEEPROM

drivers/media/video/et61x251/Kconfig

+1 −1
Original line number Diff line number Diff line 
config USB_ET61X251

	tristate "USB ET61X[12]51 PC Camera Controller support"

	depends on USB && VIDEO_V4L1

	depends on VIDEO_V4L1

	---help---

	  Say Y here if you want support for cameras based on Etoms ET61X151

	  or ET61X251 PC Camera Controllers.

drivers/media/video/pvrusb2/Kconfig

+1 −1
Original line number Diff line number Diff line 
config VIDEO_PVRUSB2

	tristate "Hauppauge WinTV-PVR USB2 support"

	depends on VIDEO_V4L2 && USB && I2C && EXPERIMENTAL

	depends on VIDEO_V4L2 && I2C && EXPERIMENTAL

	select FW_LOADER

	select VIDEO_TUNER

	select VIDEO_TVEEPROM

CRA Git | Maintained and supported by SUSTech CRA and CCSE