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 branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
arch
/
sh
/
include
/
asm
/
system.h
diff --git
a/arch/sh/include/asm/system.h
b/arch/sh/include/asm/system.h
index
1f1af5a
..
10c8b18
100644
(file)
--- a/
arch/sh/include/asm/system.h
+++ b/
arch/sh/include/asm/system.h
@@
-10,6
+10,7
@@
#include <linux/compiler.h>
#include <linux/linkage.h>
#include <asm/types.h>
#include <linux/compiler.h>
#include <linux/linkage.h>
#include <asm/types.h>
+#include <asm/uncached.h>
#define AT_VECTOR_SIZE_ARCH 5 /* entries in ARCH_DLINFO */
#define AT_VECTOR_SIZE_ARCH 5 /* entries in ARCH_DLINFO */
@@
-137,9
+138,6
@@
extern unsigned int instruction_size(unsigned int insn);
#define instruction_size(insn) (4)
#endif
#define instruction_size(insn) (4)
#endif
-extern unsigned long cached_to_uncached;
-extern unsigned long uncached_size;
-
void per_cpu_trap_init(void);
void default_idle(void);
void cpu_idle_wait(void);
void per_cpu_trap_init(void);
void default_idle(void);
void cpu_idle_wait(void);