---

yaml
---
r: 330913
b: refs/heads/master
c: fc2bbfb
h: refs/heads/master
i:
  330911: 1710915
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6334460f2929c02d0d1f0fbad9f909229d00d50
+refs/heads/master: fc2bbfb2c3d77c0b6da76224ef1575f0e90327e8

trunk/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

trunk/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

trunk/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