diff --git a/[refs] b/[refs]
index a02d0e802eec..dc94bed5daae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ec85c03d045d5ec24d6f15649a68646aefe88ba
+refs/heads/master: f2e782efb0876214c77a48e8e67248125f1607c1
diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig
index f87c0171f4ec..9060e7137441 100644
--- a/trunk/drivers/video/Kconfig
+++ b/trunk/drivers/video/Kconfig
@@ -961,7 +961,7 @@ config FB_ATY128
 
 config FB_ATY
 	tristate "ATI Mach64 display support" if PCI || ATARI
-	depends on FB
+	depends on FB && !SPARC32
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT