3 files changed, 37 insertions, 50 deletions
diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/fb.h
index 97bcaefd2064..be4e4c6797e8 100644
--- a/arch/m68k/include/asm/fb.h
+++ b/arch/m68k/include/asm/fb.h
@@ -1,5 +1,38 @@
-#ifdef __uClinux__
+#ifndef _ASM_FB_H_
-#include "fb_no.h"
+#define _ASM_FB_H_
+#include <linux/fb.h>
+#include <linux/fs.h>
+#include <asm/page.h>
+#include <asm/setup.h>
+#ifdef CONFIG_MMU
+#ifdef CONFIG_SUN3
+static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
+                                unsigned long off)
+{
+        pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE;
+}
 #else
-#include "fb_mm.h"
+static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
-#endif
+                                unsigned long off)
+{
+        if (CPU_IS_020_OR_030)
+                pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030;
+        if (CPU_IS_040_OR_060) {
+                pgprot_val(vma->vm_page_prot) &= _CACHEMASK040;
+                /* Use no-cache mode, serialized */
+                pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S;
+        }
+}
+#endif /* CONFIG_SUN3 */
+#else
+#define fb_pgprotect(...) do {} while (0)
+#endif /* CONFIG_MMU */
+static inline int fb_is_primary_device(struct fb_info *info)
+{
+        return 0;
+}
+#endif /* _ASM_FB_H_ */
diff --git a/arch/m68k/include/asm/fb_mm.h b/arch/m68k/include/asm/fb_mm.h
deleted file mode 100644
index 380b97ae8157..000000000000
--- a/arch/m68k/include/asm/fb_mm.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
-#include <linux/fb.h>
-#include <linux/fs.h>
-#include <asm/page.h>
-#include <asm/setup.h>
-#ifdef CONFIG_SUN3
-static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
-                                unsigned long off)
-{
-        pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE;
-}
-#else
-static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
-                                unsigned long off)
-{
-        if (CPU_IS_020_OR_030)
-                pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030;
-        if (CPU_IS_040_OR_060) {
-                pgprot_val(vma->vm_page_prot) &= _CACHEMASK040;
-                /* Use no-cache mode, serialized */
-                pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S;
-        }
-}
-#endif /* CONFIG_SUN3 */
-static inline int fb_is_primary_device(struct fb_info *info)
-{
-        return 0;
-}
-#endif /* _ASM_FB_H_ */
diff --git a/arch/m68k/include/asm/fb_no.h b/arch/m68k/include/asm/fb_no.h
deleted file mode 100644
index c7df38030992..000000000000
--- a/arch/m68k/include/asm/fb_no.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#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_ */

diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/fb.h index 97bcaefd2064..be4e4c6797e8 100644 --- a/arch/m68k/include/asm/fb.h +++ b/arch/m68k/include/asm/fb.h
@@ -1,5 +1,38 @@
1	#ifdef __uClinux__	1	#ifndef _ASM_FB_H_
2	#include "fb_no.h"	2	#define _ASM_FB_H_
		3
		4	#include <linux/fb.h>
		5	#include <linux/fs.h>
		6	#include <asm/page.h>
		7	#include <asm/setup.h>
		8
		9	#ifdef CONFIG_MMU
		10	#ifdef CONFIG_SUN3
		11	static inline void fb_pgprotect(struct file file, struct vm_area_struct vma,
		12	unsigned long off)
		13	{
		14	pgprot_val(vma->vm_page_prot) \|= SUN3_PAGE_NOCACHE;
		15	}
3	#else	16	#else
4	#include "fb_mm.h"	17	static inline void fb_pgprotect(struct file file, struct vm_area_struct vma,
5	#endif	18	unsigned long off)
		19	{
		20	if (CPU_IS_020_OR_030)
		21	pgprot_val(vma->vm_page_prot) \|= _PAGE_NOCACHE030;
		22	if (CPU_IS_040_OR_060) {
		23	pgprot_val(vma->vm_page_prot) &= _CACHEMASK040;
		24	/* Use no-cache mode, serialized */
		25	pgprot_val(vma->vm_page_prot) \|= _PAGE_NOCACHE_S;
		26	}
		27	}
		28	#endif /* CONFIG_SUN3 */
		29	#else
		30	#define fb_pgprotect(...) do {} while (0)
		31	#endif /* CONFIG_MMU */
		32
		33	static inline int fb_is_primary_device(struct fb_info *info)
		34	{
		35	return 0;
		36	}
		37
		38	#endif /* _ASM_FB_H_ */


diff --git a/arch/m68k/include/asm/fb_mm.h b/arch/m68k/include/asm/fb_mm.h deleted file mode 100644 index 380b97ae8157..000000000000 --- a/arch/m68k/include/asm/fb_mm.h +++ /dev/null
@@ -1,34 +0,0 @@
1	#ifndef _ASM_FB_H_
2	#define _ASM_FB_H_
3
4	#include <linux/fb.h>
5	#include <linux/fs.h>
6	#include <asm/page.h>
7	#include <asm/setup.h>
8
9	#ifdef CONFIG_SUN3
10	static inline void fb_pgprotect(struct file file, struct vm_area_struct vma,
11	unsigned long off)
12	{
13	pgprot_val(vma->vm_page_prot) \|= SUN3_PAGE_NOCACHE;
14	}
15	#else
16	static inline void fb_pgprotect(struct file file, struct vm_area_struct vma,
17	unsigned long off)
18	{
19	if (CPU_IS_020_OR_030)
20	pgprot_val(vma->vm_page_prot) \|= _PAGE_NOCACHE030;
21	if (CPU_IS_040_OR_060) {
22	pgprot_val(vma->vm_page_prot) &= _CACHEMASK040;
23	/* Use no-cache mode, serialized */
24	pgprot_val(vma->vm_page_prot) \|= _PAGE_NOCACHE_S;
25	}
26	}
27	#endif /* CONFIG_SUN3 */
28
29	static inline int fb_is_primary_device(struct fb_info *info)
30	{
31	return 0;
32	}
33
34	#endif /* _ASM_FB_H_ */


diff --git a/arch/m68k/include/asm/fb_no.h b/arch/m68k/include/asm/fb_no.h deleted file mode 100644 index c7df38030992..000000000000 --- a/arch/m68k/include/asm/fb_no.h +++ /dev/null
@@ -1,12 +0,0 @@
1	#ifndef _ASM_FB_H_
2	#define _ASM_FB_H_
3	#include <linux/fb.h>
4
5	#define fb_pgprotect(...) do {} while (0)
6
7	static inline int fb_is_primary_device(struct fb_info *info)
8	{
9	return 0;
10	}
11
12	#endif /* _ASM_FB_H_ */