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 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
sparc
/
include
/
asm
/
jsflash.h
diff --git
a/arch/sparc/include/asm/jsflash.h
b/arch/sparc/include/asm/jsflash.h
index
3457f29
..
0717d9e
100644
(file)
--- a/
arch/sparc/include/asm/jsflash.h
+++ b/
arch/sparc/include/asm/jsflash.h
@@
-8,7
+8,7
@@
#define _SPARC_JSFLASH_H
#ifndef _SPARC_TYPES_H
-#include <
asm
/types.h>
+#include <
linux
/types.h>
#endif
/*