diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-20 09:47:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-21 07:01:43 -0400 |
commit | fc2bbfb2c3d77c0b6da76224ef1575f0e90327e8 (patch) | |
tree | 5ae4e10ba7ae45c86c6d14ac5a4cdc317f14975e /drivers | |
parent | b6334460f2929c02d0d1f0fbad9f909229d00d50 (diff) |
[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>
Diffstat (limited to 'drivers')
-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 @@ | |||
1 | menu "V4L ISA and parallel port devices" | 1 | menuconfig MEDIA_PARPORT_SUPPORT |
2 | visible if (ISA || PARPORT) && MEDIA_CAMERA_SUPPORT | 2 | bool "V4L ISA and parallel port devices" |
3 | depends on (ISA || PARPORT) && MEDIA_CAMERA_SUPPORT | ||
3 | 4 | ||
5 | if MEDIA_PARPORT_SUPPORT | ||
4 | config VIDEO_BWQCAM | 6 | config VIDEO_BWQCAM |
5 | tristate "Quickcam BW Video For Linux" | 7 | tristate "Quickcam BW Video For Linux" |
6 | depends on PARPORT && VIDEO_V4L2 | 8 | depends on PARPORT && VIDEO_V4L2 |
@@ -44,4 +46,4 @@ config VIDEO_W9966 | |||
44 | 46 | ||
45 | Check out <file:Documentation/video4linux/w9966.txt> for more | 47 | Check out <file:Documentation/video4linux/w9966.txt> for more |
46 | information. | 48 | information. |
47 | endmenu | 49 | 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 @@ | |||
1 | # | 1 | menuconfig MEDIA_PCI_SUPPORT |
2 | # DVB device configuration | 2 | bool "Media PCI Adapters" |
3 | # | 3 | depends on PCI && MEDIA_SUPPORT |
4 | 4 | ||
5 | menu "Media PCI Adapters" | 5 | if MEDIA_PCI_SUPPORT |
6 | visible if PCI && MEDIA_SUPPORT | ||
7 | 6 | ||
8 | if MEDIA_CAMERA_SUPPORT | 7 | if MEDIA_CAMERA_SUPPORT |
9 | comment "Media capture support" | 8 | comment "Media capture support" |
@@ -42,4 +41,4 @@ source "drivers/media/pci/ngene/Kconfig" | |||
42 | source "drivers/media/pci/ddbridge/Kconfig" | 41 | source "drivers/media/pci/ddbridge/Kconfig" |
43 | endif | 42 | endif |
44 | 43 | ||
45 | endmenu | 44 | 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 @@ | |||
1 | # | 1 | menuconfig MEDIA_USB_SUPPORT |
2 | # USB media device configuration | 2 | bool "Media USB Adapters" |
3 | # | 3 | depends on USB && MEDIA_SUPPORT |
4 | 4 | ||
5 | menu "Media USB Adapters" | 5 | if MEDIA_USB_SUPPORT |
6 | visible if USB && MEDIA_SUPPORT | ||
7 | 6 | ||
8 | if MEDIA_CAMERA_SUPPORT | 7 | if MEDIA_CAMERA_SUPPORT |
9 | comment "Webcam devices" | 8 | comment "Webcam devices" |
@@ -25,7 +24,6 @@ source "drivers/media/usb/hdpvr/Kconfig" | |||
25 | source "drivers/media/usb/tlg2300/Kconfig" | 24 | source "drivers/media/usb/tlg2300/Kconfig" |
26 | source "drivers/media/usb/usbvision/Kconfig" | 25 | source "drivers/media/usb/usbvision/Kconfig" |
27 | source "drivers/media/usb/stk1160/Kconfig" | 26 | source "drivers/media/usb/stk1160/Kconfig" |
28 | |||
29 | endif | 27 | endif |
30 | 28 | ||
31 | if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT) | 29 | 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) | |||
50 | source "drivers/media/usb/em28xx/Kconfig" | 48 | source "drivers/media/usb/em28xx/Kconfig" |
51 | endif | 49 | endif |
52 | 50 | ||
53 | endmenu | 51 | endif #MEDIA_USB_SUPPORT |