diff --git a/[refs] b/[refs]
index c07ec91f71de..7fa219bf0953 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6404fccafa3bfdc0602130a87f4d93baf928bea4
+refs/heads/master: f04e879bf296d136bcafd8c5a26e95599b141671
diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig
index a5755b88de2a..f15fb024e806 100644
--- a/trunk/drivers/video/Kconfig
+++ b/trunk/drivers/video/Kconfig
@@ -911,7 +911,7 @@ config FB_XVR2500
 
 config FB_XVR1000
 	bool "Sun XVR-1000 support"
-	depends on SPARC64
+	depends on (FB = y) && SPARC64
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT