summaryrefslogtreecommitdiffstats
path: root/arch/cris/include/asm/fb.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-20 09:02:39 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-20 09:02:39 +0100
commitfbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch)
treefeb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /arch/cris/include/asm/fb.h
parenta3d732f93785da17e0137210deadb4616f5536fc (diff)
parentee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff)
downloadop-kernel-dev-fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c.zip
op-kernel-dev-fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c.tar.gz
Merge branch 'linus' into x86/uv
Diffstat (limited to 'arch/cris/include/asm/fb.h')
-rw-r--r--arch/cris/include/asm/fb.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/cris/include/asm/fb.h b/arch/cris/include/asm/fb.h
new file mode 100644
index 0000000..c7df380
--- /dev/null
+++ b/arch/cris/include/asm/fb.h
@@ -0,0 +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_ */
OpenPOWER on IntegriCloud