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

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index af66a5d5ecd8b484af9ad661f59071c4714f8d5b..354d664ca537c1cba224b7f449a29b6510b54129 100644 (file)
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -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

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index bc773781993a5b75113388a623f12f64fa697556..29f7b7181e17bc830c5cb83d6905a8c675528309 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -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

diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
index 9285a58e47aae9a166723809b1df65c57f1525a4..3823b62da4a4b70f3f28b5b4298ae65c8cd4fdb2 100644 (file)
--- a/drivers/media/video/em28xx/Kconfig
+++ b/drivers/media/video/em28xx/Kconfig
@@ -1,6 +1,6 @@
 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

diff --git a/drivers/media/video/et61x251/Kconfig b/drivers/media/video/et61x251/Kconfig
index c6bff705688d0e02404b7730a972557042e67cd4..664676f440685cdc0f405ba97a84560e5f132811 100644 (file)
--- a/drivers/media/video/et61x251/Kconfig
+++ b/drivers/media/video/et61x251/Kconfig
@@ -1,6 +1,6 @@
 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.

diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index 5645c9318890d6c701f3bfb9aed7729830fa42fb..d0c2cd7854303fc8167a8203f85ee7f30493a27b 100644 (file)
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -1,6 +1,6 @@
 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

diff --git a/drivers/media/video/pwc/Kconfig b/drivers/media/video/pwc/Kconfig
index 8fdf7101d3bfcabb31863d6f0a5622ed5071bb5e..7298cf2e1650f53f2c5e90f0873045d295e43c17 100644 (file)
--- a/drivers/media/video/pwc/Kconfig
+++ b/drivers/media/video/pwc/Kconfig
@@ -1,6 +1,6 @@
 config USB_PWC
        tristate "USB Philips Cameras"
-       depends on USB && VIDEO_V4L1
+       depends on VIDEO_V4L1
        ---help---
          Say Y or M here if you want to use one of these Philips & OEM
          webcams:

diff --git a/drivers/media/video/sn9c102/Kconfig b/drivers/media/video/sn9c102/Kconfig
index 19204f5686e16759991a9bb77eb528f6de136c3e..f71f272776dedca9d945ad7b6d4fe760d53767bc 100644 (file)
--- a/drivers/media/video/sn9c102/Kconfig
+++ b/drivers/media/video/sn9c102/Kconfig
@@ -1,6 +1,6 @@
 config USB_SN9C102
        tristate "USB SN9C1xx PC Camera Controller support"
-       depends on USB && VIDEO_V4L2
+       depends on VIDEO_V4L2
        ---help---
          Say Y here if you want support for cameras based on SONiX SN9C101,
          SN9C102, SN9C103, SN9C105 and SN9C120 PC Camera Controllers.

diff --git a/drivers/media/video/usbvideo/Kconfig b/drivers/media/video/usbvideo/Kconfig
index a0fd82b924f20780fb18c88eb3805e6e1a713f2d..e4cb99c1f94be8e930c4aa858ec4a5de69aab019 100644 (file)
--- a/drivers/media/video/usbvideo/Kconfig
+++ b/drivers/media/video/usbvideo/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_USBVIDEO
 
 config USB_VICAM
        tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
-       depends on USB && VIDEO_DEV && VIDEO_V4L1 && EXPERIMENTAL
+       depends on VIDEO_V4L1 && EXPERIMENTAL
        select VIDEO_USBVIDEO
        ---help---
          Say Y here if you have 3com homeconnect camera (vicam).
@@ -13,7 +13,7 @@ config USB_VICAM
 
 config USB_IBMCAM
        tristate "USB IBM (Xirlink) C-it Camera support"
-       depends on USB && VIDEO_DEV && VIDEO_V4L1
+       depends on VIDEO_V4L1
        select VIDEO_USBVIDEO
        ---help---
          Say Y here if you want to connect a IBM "C-It" camera, also known as
@@ -28,7 +28,7 @@ config USB_IBMCAM
 
 config USB_KONICAWC
        tristate "USB Konica Webcam support"
-       depends on USB && VIDEO_DEV && VIDEO_V4L1
+       depends on VIDEO_V4L1
        select VIDEO_USBVIDEO
        ---help---
          Say Y here if you want support for webcams based on a Konica
@@ -39,7 +39,7 @@ config USB_KONICAWC
 
 config USB_QUICKCAM_MESSENGER
        tristate "USB Logitech Quickcam Messenger"
-       depends on USB && VIDEO_DEV && VIDEO_V4L1
+       depends on VIDEO_V4L1
        select VIDEO_USBVIDEO
        ---help---
          Say Y or M here to enable support for the USB Logitech Quickcam

diff --git a/drivers/media/video/usbvision/Kconfig b/drivers/media/video/usbvision/Kconfig
index c43a5d8990918bbffb510dbecfe47600360a392b..fc24ef05b3f31cf527b6fc850423cae317ad224b 100644 (file)
--- a/drivers/media/video/usbvision/Kconfig
+++ b/drivers/media/video/usbvision/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_USBVISION
        tristate "USB video devices based on Nogatech NT1003/1004/1005"
-       depends on I2C && VIDEO_V4L2 && USB
+       depends on I2C && VIDEO_V4L2
        select VIDEO_TUNER
        select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
        ---help---

diff --git a/drivers/media/video/zc0301/Kconfig b/drivers/media/video/zc0301/Kconfig
index a859a6920189e5cc62d64e864b6cfc79d995ca2d..47cd93f9c7de8555c7f181b0d17fc7a75793dbc6 100644 (file)
--- a/drivers/media/video/zc0301/Kconfig
+++ b/drivers/media/video/zc0301/Kconfig
@@ -1,6 +1,6 @@
 config USB_ZC0301
        tristate "USB ZC0301[P] Image Processor and Control Chip support"
-       depends on USB && VIDEO_V4L1
+       depends on VIDEO_V4L1
        ---help---
          Say Y here if you want support for cameras based on the ZC0301 or
          ZC0301P Image Processors and Control Chips.