git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
3d05870
..
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
#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)
#if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
# define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)