diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2009-02-06 05:34:47 +0100 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2009-03-24 06:17:44 +0100 |
| commit | b0ffbf26124563fa17ef5a35266ee8e3f3ab2b91 (patch) | |
| tree | d87cb8a3c10652ab50ecc0a15e9e0d6930a2ee67 | |
| parent | m68k: use the mmu version of bootinfo.h for m68knommu as well (diff) | |
| download | linux-b0ffbf26124563fa17ef5a35266ee8e3f3ab2b91.tar.xz linux-b0ffbf26124563fa17ef5a35266ee8e3f3ab2b91.zip | |
m68k: use the mmu version of cache.h for m68knommu as well
The non-mmu version of cache.h is almost the same as the mmu version.
Merge them.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| -rw-r--r-- | arch/m68k/include/asm/cache.h | 14 | ||||
| -rw-r--r-- | arch/m68k/include/asm/cache_mm.h | 11 | ||||
| -rw-r--r-- | arch/m68k/include/asm/cache_no.h | 12 |
3 files changed, 10 insertions, 27 deletions
diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h index 599c29bc8f40..fed3fd30de7e 100644 --- a/arch/m68k/include/asm/cache.h +++ b/arch/m68k/include/asm/cache.h @@ -1,5 +1,11 @@ -#ifdef __uClinux__ -#include "cache_no.h" -#else -#include "cache_mm.h" +/* + * include/asm-m68k/cache.h + */ +#ifndef __ARCH_M68K_CACHE_H +#define __ARCH_M68K_CACHE_H + +/* bytes per L1 cache line */ +#define L1_CACHE_SHIFT 4 +#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT) + #endif diff --git a/arch/m68k/include/asm/cache_mm.h b/arch/m68k/include/asm/cache_mm.h deleted file mode 100644 index fed3fd30de7e..000000000000 --- a/arch/m68k/include/asm/cache_mm.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * include/asm-m68k/cache.h - */ -#ifndef __ARCH_M68K_CACHE_H -#define __ARCH_M68K_CACHE_H - -/* bytes per L1 cache line */ -#define L1_CACHE_SHIFT 4 -#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT) - -#endif diff --git a/arch/m68k/include/asm/cache_no.h b/arch/m68k/include/asm/cache_no.h deleted file mode 100644 index 24e9eace5f8c..000000000000 --- a/arch/m68k/include/asm/cache_no.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __ARCH_M68KNOMMU_CACHE_H -#define __ARCH_M68KNOMMU_CACHE_H - -/* bytes per L1 cache line */ -#define L1_CACHE_BYTES 16 /* this need to be at least 1 */ - -/* m68k-elf-gcc 2.95.2 doesn't like these */ - -#define __cacheline_aligned -#define ____cacheline_aligned - -#endif |