---

yaml --- r: 71036 b: refs/heads/master c: 106619c h: refs/heads/master v: v3
git-mirror · Oct 17, 2007 · 5857837 · 5857837
1 parent 4287f4e
commit 5857837
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 39 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f7afb08a595292d946a5f1fd4929c81db7042d2
+refs/heads/master: 106619c440a7cd5a100eaba38665231ab8c762b8
diff --git a/trunk/include/asm-x86/fb.h b/trunk/include/asm-x86/fb.h
@@ -1,5 +1,21 @@
+#ifndef _ASM_X86_FB_H
+#define _ASM_X86_FB_H
+
+#include <linux/fb.h>
+#include <linux/fs.h>
+#include <asm/page.h>
+
+static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
+				unsigned long off)
+{
+	if (boot_cpu_data.x86 > 3)
+		pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
+}
+
 #ifdef CONFIG_X86_32
-# include "fb_32.h"
+extern int fb_is_primary_device(struct fb_info *info);
 #else
-# include "fb_64.h"
+static inline int fb_is_primary_device(struct fb_info *info) { return 0; }
 #endif
+
+#endif /* _ASM_X86_FB_H */
diff --git a/trunk/include/asm-x86/fb_32.h b/trunk/include/asm-x86/fb_32.h
diff --git a/trunk/include/asm-x86/fb_64.h b/trunk/include/asm-x86/fb_64.h