Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[karo-tx-linux.git] / include / asm-avr32 / fb.h

diff --git a/include/asm-avr32/fb.h b/include/asm-avr32/fb.h
index d22a4a876694bf6a12928ce07a2b76f4ca717b54..41baf84ad402417a7a50c93f5c1a71fa005b0f0d 100644 (file)
--- a/include/asm-avr32/fb.h
+++ b/include/asm-avr32/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,
                                     | (_PAGE_BUFFER | _PAGE_DIRTY));
 }
 
+static inline int fb_is_primary_device(struct fb_info *info)
+{
+       return 0;
+}
+
 #endif /* _ASM_FB_H_ */