Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / include / asm-sparc64 / fb.h

diff --git a/include/asm-sparc64/fb.h b/include/asm-sparc64/fb.h
index d6cd3a175fc34b8fbcec6f034905b4c7f588621a..389012e5fbad874bcb2432f41472ad9d948ecd51 100644 (file)
--- a/include/asm-sparc64/fb.h
+++ b/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;
 }