Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6] / include / asm-mips / cache.h

diff --git a/include/asm-mips/cache.h b/include/asm-mips/cache.h
index 4517bdf209536ebe572f9f0fcdd86b71daa78471..55e19f2ff0e012474a2d0f4c94a123e5e72bc9d9 100644 (file)
--- a/include/asm-mips/cache.h
+++ b/include/asm-mips/cache.h
@@ -10,14 +10,12 @@
 #define _ASM_CACHE_H
 
 #include <linux/config.h>
+#include <kmalloc.h>
 
 #define L1_CACHE_SHIFT         CONFIG_MIPS_L1_CACHE_SHIFT
 #define L1_CACHE_BYTES         (1 << L1_CACHE_SHIFT)
 
-#define L1_CACHE_SHIFT_MAX     6
 #define SMP_CACHE_SHIFT                L1_CACHE_SHIFT
 #define SMP_CACHE_BYTES                L1_CACHE_BYTES
 
-#define ARCH_KMALLOC_MINALIGN  8
-
 #endif /* _ASM_CACHE_H */