Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into...

[pandora-kernel.git] / include / asm-um / cache.h

diff --git a/include/asm-um/cache.h b/include/asm-um/cache.h
index a10602a..19e1bdd 100644 (file)
--- a/include/asm-um/cache.h
+++ b/include/asm-um/cache.h
@@ -1,7 +1,6 @@
 #ifndef __UM_CACHE_H
 #define __UM_CACHE_H
 
-#include <linux/config.h>
 
 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
 # define L1_CACHE_SHIFT                (CONFIG_X86_L1_CACHE_SHIFT)
@@ -13,9 +12,6 @@
 # define L1_CACHE_SHIFT                5
 #endif
 
-/* XXX: this is valid for x86 and x86_64. */
-#define L1_CACHE_SHIFT_MAX     7       /* largest L1 which this arch supports */
-
 #define L1_CACHE_BYTES         (1 << L1_CACHE_SHIFT)
 
 #endif