From 5857837165e1a897ac5c21e00aa3aa3bb94055b7 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 15 Oct 2007 23:28:20 +0200
Subject: [PATCH] --- yaml --- r: 71036 b: refs/heads/master c:
 106619c440a7cd5a100eaba38665231ab8c762b8 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/include/asm-x86/fb.h    | 20 ++++++++++++++++++--
 trunk/include/asm-x86/fb_32.h | 17 -----------------
 trunk/include/asm-x86/fb_64.h | 19 -------------------
 4 files changed, 19 insertions(+), 39 deletions(-)
 delete mode 100644 trunk/include/asm-x86/fb_32.h
 delete mode 100644 trunk/include/asm-x86/fb_64.h

diff --git a/[refs] b/[refs]
index 45f842a6e431..59e299db6727 100644
--- 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
index 238c7ca45877..53018464aea6 100644
--- 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
deleted file mode 100644
index d1c6297d4a61..000000000000
--- a/trunk/include/asm-x86/fb_32.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
-
-#include <linux/fb.h>
-#include <linux/fs.h>
-#include <asm/page.h>
-
-extern int fb_is_primary_device(struct fb_info *info);
-
-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;
-}
-
-#endif /* _ASM_FB_H_ */
diff --git a/trunk/include/asm-x86/fb_64.h b/trunk/include/asm-x86/fb_64.h
deleted file mode 100644
index 60548e651d12..000000000000
--- a/trunk/include/asm-x86/fb_64.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_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;
-}
-
-static inline int fb_is_primary_device(struct fb_info *info)
-{
-	return 0;
-}
-
-#endif /* _ASM_FB_H_ */