diff options
| author |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-20 10:47:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-21 08:01:43 -0300 |
| commit | fc2bbfb2c3d77c0b6da76224ef1575f0e90327e8 (patch) | |
| tree | 5ae4e10ba7ae45c86c6d14ac5a4cdc317f14975e | |
| parent | [media] Cleanup media Kconfig files (diff) | |
| download | linux-dev-fc2bbfb2c3d77c0b6da76224ef1575f0e90327e8.tar.xz linux-dev-fc2bbfb2c3d77c0b6da76224ef1575f0e90327e8.zip | |
[media] Kconfig: use menuconfig instead of menu
This allows disabling all drivers of a certain type as a hole
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/parport/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/media/pci/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/media/usb/Kconfig | 12 |
3 files changed, 15 insertions, 16 deletions
diff --git a/drivers/media/parport/Kconfig b/drivers/media/parport/Kconfig index 48138fe46e0e..a1c7853f3a96 100644 --- a/drivers/media/parport/Kconfig +++ b/drivers/media/parport/Kconfig @@ -1,6 +1,8 @@ -menu "V4L ISA and parallel port devices" - visible if (ISA || PARPORT) && MEDIA_CAMERA_SUPPORT +menuconfig MEDIA_PARPORT_SUPPORT + bool "V4L ISA and parallel port devices" + depends on (ISA || PARPORT) && MEDIA_CAMERA_SUPPORT +if MEDIA_PARPORT_SUPPORT config VIDEO_BWQCAM tristate "Quickcam BW Video For Linux" depends on PARPORT && VIDEO_V4L2 @@ -44,4 +46,4 @@ config VIDEO_W9966 Check out <file:Documentation/video4linux/w9966.txt> for more information. -endmenu +endif diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig index 4243d5d38c0a..083b62f8b970 100644 --- a/drivers/media/pci/Kconfig +++ b/drivers/media/pci/Kconfig @@ -1,9 +1,8 @@ -# -# DVB device configuration -# +menuconfig MEDIA_PCI_SUPPORT + bool "Media PCI Adapters" + depends on PCI && MEDIA_SUPPORT -menu "Media PCI Adapters" - visible if PCI && MEDIA_SUPPORT +if MEDIA_PCI_SUPPORT if MEDIA_CAMERA_SUPPORT comment "Media capture support" @@ -42,4 +41,4 @@ source "drivers/media/pci/ngene/Kconfig" source "drivers/media/pci/ddbridge/Kconfig" endif -endmenu +endif #MEDIA_PCI_SUPPORT diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig index 069a3c1d03f5..f960e7ca4738 100644 --- a/drivers/media/usb/Kconfig +++ b/drivers/media/usb/Kconfig @@ -1,9 +1,8 @@ -# -# USB media device configuration -# +menuconfig MEDIA_USB_SUPPORT + bool "Media USB Adapters" + depends on USB && MEDIA_SUPPORT -menu "Media USB Adapters" - visible if USB && MEDIA_SUPPORT +if MEDIA_USB_SUPPORT if MEDIA_CAMERA_SUPPORT comment "Webcam devices" @@ -25,7 +24,6 @@ source "drivers/media/usb/hdpvr/Kconfig" source "drivers/media/usb/tlg2300/Kconfig" source "drivers/media/usb/usbvision/Kconfig" source "drivers/media/usb/stk1160/Kconfig" - endif if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) @@ -50,4 +48,4 @@ if (MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) source "drivers/media/usb/em28xx/Kconfig" endif -endmenu +endif #MEDIA_USB_SUPPORT |