diff --git a/[refs] b/[refs]
index d3cf4cecd232..7eff591ff2de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba5f0a4e15e736d99d698ce498bd6f1f16d014cf
+refs/heads/master: 765bf9770fda950e6615451ad1a4b8866bda7dfa
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
index 0dce9ab03ada..912791779cb4 100644
--- a/trunk/drivers/media/video/Kconfig
+++ b/trunk/drivers/media/video/Kconfig
@@ -18,7 +18,7 @@ config VIDEO_ADV_DEBUG
 
 config VIDEO_VIVI
 	tristate "Virtual Video Driver"
-	depends on VIDEO_V4L2
+	depends on VIDEO_V4L2 && !SPARC32 && !SPARC64
 	default n
 	---help---
 	  Enables a virtual video driver. This device shows a color bar