diff --git a/[refs] b/[refs]
index 144caaa88444..37aab522d698 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fccea74ff8b5159935acc7b4b4857ee81ee44661
+refs/heads/master: 8511f8eaa86bb16e4e2bd5f30d5f12764f59ae8d
diff --git a/trunk/drivers/media/common/b2c2/Kconfig b/trunk/drivers/media/common/b2c2/Kconfig
index 29149de66982..1df9e578daa5 100644
--- a/trunk/drivers/media/common/b2c2/Kconfig
+++ b/trunk/drivers/media/common/b2c2/Kconfig
@@ -23,9 +23,6 @@ config DVB_B2C2_FLEXCOP
 
 	  Say Y if you own such a device and want to use it.
 
+# Selected via the PCI or USB flexcop drivers
 config DVB_B2C2_FLEXCOP_DEBUG
-	bool "Enable debug for the B2C2 FlexCop drivers"
-	depends on DVB_B2C2_FLEXCOP
-	help
-	  Say Y if you want to enable the module option to control debug messages
-	  of all B2C2 FlexCop drivers.
+	bool
diff --git a/trunk/drivers/media/pci/b2c2/Kconfig b/trunk/drivers/media/pci/b2c2/Kconfig
index aaa1f30f1ae0..78ced474aa8d 100644
--- a/trunk/drivers/media/pci/b2c2/Kconfig
+++ b/trunk/drivers/media/pci/b2c2/Kconfig
@@ -4,3 +4,11 @@ config DVB_B2C2_FLEXCOP_PCI
 	  Support for the Air/Sky/CableStar2 PCI card (DVB/ATSC) by Technisat/B2C2.
 
 	  Say Y if you own such a device and want to use it.
+
+config DVB_B2C2_FLEXCOP_PCI_DEBUG
+	bool "Enable debug for the B2C2 FlexCop drivers"
+	depends on DVB_B2C2_FLEXCOP_PCI
+	select DVB_B2C2_FLEXCOP_DEBUG
+	help
+	Say Y if you want to enable the module option to control debug messages
+	of all B2C2 FlexCop drivers.
diff --git a/trunk/drivers/media/usb/b2c2/Kconfig b/trunk/drivers/media/usb/b2c2/Kconfig
index 3af7c4155473..ba16583c5e13 100644
--- a/trunk/drivers/media/usb/b2c2/Kconfig
+++ b/trunk/drivers/media/usb/b2c2/Kconfig
@@ -4,3 +4,11 @@ config DVB_B2C2_FLEXCOP_USB
 	  Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2,
 
 	  Say Y if you own such a device and want to use it.
+
+config DVB_B2C2_FLEXCOP_USB_DEBUG
+	bool "Enable debug for the B2C2 FlexCop drivers"
+	depends on DVB_B2C2_FLEXCOP_USB
+	select DVB_B2C2_FLEXCOP_DEBUG
+	   help
+	Say Y if you want to enable the module option to control debug messages
+	of all B2C2 FlexCop drivers.