m68knommu: move inclusion of ColdFire v4 cache registers

Move the inclusion of the version 4 cache controller registers so that
it is with all the other register bit flag definitions. This makes it
consistent with the other version core inclusion points, and means we
don't need "#ifdef"ery in odd-ball places for these definitions.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

+5 -5
+1 -3
arch/m68k/include/asm/cacheflush_no.h
··· 5 * (C) Copyright 2000-2004, Greg Ungerer <gerg@snapgear.com> 6 */ 7 #include <linux/mm.h> 8 - #if defined(CONFIG_M5407) || defined(CONFIG_M54xx) 9 - #include <asm/m54xxacr.h> 10 - #endif 11 12 #define flush_cache_all() __flush_cache_all() 13 #define flush_cache_mm(mm) do { } while (0)
··· 5 * (C) Copyright 2000-2004, Greg Ungerer <gerg@snapgear.com> 6 */ 7 #include <linux/mm.h> 8 + #include <asm/mcfsim.h> 9 10 #define flush_cache_all() __flush_cache_all() 11 #define flush_cache_mm(mm) do { } while (0)
+2
arch/m68k/include/asm/m5407sim.h
··· 17 #define CPU_NAME "COLDFIRE(m5407)" 18 #define CPU_INSTR_PER_JIFFY 3 19 20 /* 21 * Define the 5407 SIM register set addresses. 22 */
··· 17 #define CPU_NAME "COLDFIRE(m5407)" 18 #define CPU_INSTR_PER_JIFFY 3 19 20 + #include <asm/m54xxacr.h> 21 + 22 /* 23 * Define the 5407 SIM register set addresses. 24 */
+2
arch/m68k/include/asm/m54xxsim.h
··· 8 #define CPU_NAME "COLDFIRE(m54xx)" 9 #define CPU_INSTR_PER_JIFFY 2 10 11 #define MCFINT_VECBASE 64 12 13 /*
··· 8 #define CPU_NAME "COLDFIRE(m54xx)" 9 #define CPU_INSTR_PER_JIFFY 2 10 11 + #include <asm/m54xxacr.h> 12 + 13 #define MCFINT_VECBASE 64 14 15 /*
-2
arch/m68k/include/asm/mcfcache.h
··· 109 110 #if defined(CONFIG_M5407) || defined(CONFIG_M54xx) 111 112 - #include <asm/m54xxacr.h> 113 - 114 .macro CACHE_ENABLE 115 /* invalidate whole cache */ 116 movel #(CACR_DCINVA+CACR_BCINVA+CACR_ICINVA),%d0
··· 109 110 #if defined(CONFIG_M5407) || defined(CONFIG_M54xx) 111 112 .macro CACHE_ENABLE 113 /* invalidate whole cache */ 114 movel #(CACR_DCINVA+CACR_BCINVA+CACR_ICINVA),%d0