Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[~andy/linux] / include / asm-v850 / fb.h

diff --git a/include/asm-v850/fb.h b/include/asm-v850/fb.h
index 9f8c88d05df47c11da8faafc437785cad90299c6..c7df3803099200c9e3a9a6721138d0fe8b26ae92 100644 (file)
--- a/include/asm-v850/fb.h
+++ b/include/asm-v850/fb.h
@@ -1,6 +1,12 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
+#include <linux/fb.h>
 
 #define fb_pgprotect(...) do {} while (0)
 
+static inline int fb_is_primary_device(struct fb_info *info)
+{
+       return 0;
+}
+
 #endif /* _ASM_FB_H_ */