From 3c06f9d535dc9a5b30a1544a3e846ec2977a0463 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Tue, 9 Nov 2010 10:40:44 +1000
Subject: [PATCH] --- yaml --- r: 231820 b: refs/heads/master c:
 3d461401eb5e3a8c471e92500aebd6c115273fba h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/m68k/include/asm/cacheflush_no.h | 4 +---
 trunk/arch/m68k/include/asm/m5407sim.h      | 2 ++
 trunk/arch/m68k/include/asm/m54xxsim.h      | 2 ++
 trunk/arch/m68k/include/asm/mcfcache.h      | 2 --
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index c6fd29e345ec..7f483a02a9f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 278c2cbd59371bc8905d83b7cc3aa0bbe69c00f1
+refs/heads/master: 3d461401eb5e3a8c471e92500aebd6c115273fba
diff --git a/trunk/arch/m68k/include/asm/cacheflush_no.h b/trunk/arch/m68k/include/asm/cacheflush_no.h
index e295923020d3..52b11ac9a30c 100644
--- a/trunk/arch/m68k/include/asm/cacheflush_no.h
+++ b/trunk/arch/m68k/include/asm/cacheflush_no.h
@@ -5,9 +5,7 @@
  * (C) Copyright 2000-2004, Greg Ungerer <gerg@snapgear.com>
  */
 #include <linux/mm.h>
-#if defined(CONFIG_M5407) || defined(CONFIG_M54xx)
-#include <asm/m54xxacr.h>
-#endif
+#include <asm/mcfsim.h>
 
 #define flush_cache_all()			__flush_cache_all()
 #define flush_cache_mm(mm)			do { } while (0)
diff --git a/trunk/arch/m68k/include/asm/m5407sim.h b/trunk/arch/m68k/include/asm/m5407sim.h
index ddfff88629fe..75f5c28a551d 100644
--- a/trunk/arch/m68k/include/asm/m5407sim.h
+++ b/trunk/arch/m68k/include/asm/m5407sim.h
@@ -17,6 +17,8 @@
 #define	CPU_NAME		"COLDFIRE(m5407)"
 #define	CPU_INSTR_PER_JIFFY	3
 
+#include <asm/m54xxacr.h>
+
 /*
  *	Define the 5407 SIM register set addresses.
  */
diff --git a/trunk/arch/m68k/include/asm/m54xxsim.h b/trunk/arch/m68k/include/asm/m54xxsim.h
index a08a7ae776b1..462ae5328441 100644
--- a/trunk/arch/m68k/include/asm/m54xxsim.h
+++ b/trunk/arch/m68k/include/asm/m54xxsim.h
@@ -8,6 +8,8 @@
 #define	CPU_NAME		"COLDFIRE(m54xx)"
 #define	CPU_INSTR_PER_JIFFY	2
 
+#include <asm/m54xxacr.h>
+
 #define MCFINT_VECBASE		64
 
 /*
diff --git a/trunk/arch/m68k/include/asm/mcfcache.h b/trunk/arch/m68k/include/asm/mcfcache.h
index 437686b62fea..2b3a6cfaaac0 100644
--- a/trunk/arch/m68k/include/asm/mcfcache.h
+++ b/trunk/arch/m68k/include/asm/mcfcache.h
@@ -109,8 +109,6 @@
 
 #if defined(CONFIG_M5407) || defined(CONFIG_M54xx)
 
-#include <asm/m54xxacr.h>
-
 .macro CACHE_ENABLE
 	/* invalidate whole cache */
 	movel	#(CACR_DCINVA+CACR_BCINVA+CACR_ICINVA),%d0