diff --git a/[refs] b/[refs]
index 149ea7d2339c..3370f1dd6141 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cac29af6bd6bc5c53499f39ef1eade193295b2f1
+refs/heads/master: e5ee7305ae03e43dbe2b0e346232975f793ad0eb
diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig
index 62460561077e..2e937bdace6f 100644
--- a/trunk/drivers/video/Kconfig
+++ b/trunk/drivers/video/Kconfig
@@ -2199,7 +2199,7 @@ config FB_XILINX
 
 config FB_GOLDFISH
 	tristate "Goldfish Framebuffer"
-	depends on FB
+	depends on FB && HAS_DMA
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT