Merge branch 'linus' into cpus4096

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

diff --git a/include/asm-powerpc/fb.h b/include/asm-powerpc/fb.h
index e13d6ebc116db2aaf0617ac9d551b05b0a81bf04..411af8d17a69a7caa1dedff19777470b14c853b4 100644 (file)
--- a/include/asm-powerpc/fb.h
+++ b/include/asm-powerpc/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>
 
@@ -12,4 +13,9 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
                                                 vma->vm_page_prot);
 }
 
+static inline int fb_is_primary_device(struct fb_info *info)
+{
+       return 0;
+}
+
 #endif /* _ASM_FB_H_ */