diff --git a/[refs] b/[refs]
index 0836f6c0fa88..aaddbaf8553a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b3238ef8b04f1383b2aa7704487fb3c0e44193
+refs/heads/master: 3adf55ad5c0fcabf1c53bb274f39953cb1d6698f
diff --git a/trunk/include/asm-sparc/fb.h b/trunk/include/asm-sparc/fb.h
index c7df38030992..c73ca081e1f5 100644
--- a/trunk/include/asm-sparc/fb.h
+++ b/trunk/include/asm-sparc/fb.h
@@ -1,11 +1,20 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 #include <linux/fb.h>
+#include <asm/prom.h>
 
 #define fb_pgprotect(...) do {} while (0)
 
 static inline int fb_is_primary_device(struct fb_info *info)
 {
+	struct device *dev = info->device;
+	struct device_node *node;
+
+	node = dev->archdata.prom_node;
+	if (node &&
+	    node == of_console_device)
+		return 1;
+
 	return 0;
 }
 
diff --git a/trunk/include/asm-sparc64/fb.h b/trunk/include/asm-sparc64/fb.h
index d6cd3a175fc3..389012e5fbad 100644
--- a/trunk/include/asm-sparc64/fb.h
+++ b/trunk/include/asm-sparc64/fb.h
@@ -3,6 +3,7 @@
 #include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>
+#include <asm/prom.h>
 
 static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
 				unsigned long off)
@@ -12,6 +13,14 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
 
 static inline int fb_is_primary_device(struct fb_info *info)
 {
+	struct device *dev = info->device;
+	struct device_node *node;
+
+	node = dev->archdata.prom_node;
+	if (node &&
+	    node == of_console_device)
+		return 1;
+
 	return 0;
 }