Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6] / include / asm-sparc / fb.h

diff --git a/include/asm-sparc/fb.h b/include/asm-sparc/fb.h
index c7df3803099200c9e3a9a6721138d0fe8b26ae92..c73ca081e1f56721c6f3912dd60730b1de6ecc2b 100644 (file)
--- a/include/asm-sparc/fb.h
+++ b/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;
 }