diff --git a/[refs] b/[refs]
index 33b47e243909..578bfc3eec3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 402f6ae4d52e5f6c0fe053f307c18360f69e0132
+refs/heads/master: 7c15b715ef301a7f8bb2dc8de335497ffde568a6
diff --git a/trunk/drivers/media/common/Kconfig b/trunk/drivers/media/common/Kconfig
index ba666c707d58..b85f88c8ddbd 100644
--- a/trunk/drivers/media/common/Kconfig
+++ b/trunk/drivers/media/common/Kconfig
@@ -18,6 +18,7 @@ config VIDEO_TVEEPROM
 
 config CYPRESS_FIRMWARE
 	tristate "Cypress firmware helper routines"
+	depends on USB
 
 source "drivers/media/common/b2c2/Kconfig"
 source "drivers/media/common/saa7146/Kconfig"