Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26

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

diff --git a/include/asm-parisc/fb.h b/include/asm-parisc/fb.h
index d5e47edf5321249acc1a67ed5a19a6a81c24b4ad..4d503a023ab2b150566211ac931e3b3360d1a001 100644 (file)
--- a/include/asm-parisc/fb.h
+++ b/include/asm-parisc/fb.h
@@ -1,6 +1,7 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>
 
@@ -10,4 +11,9 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
        pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
 }
 
+static inline int fb_is_primary_device(struct fb_info *info)
+{
+       return 0;
+}
+
 #endif /* _ASM_FB_H_ */