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 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[pandora-kernel.git]
/
arch
/
arm
/
lib
/
ecard.S
diff --git
a/arch/arm/lib/ecard.S
b/arch/arm/lib/ecard.S
index
c55aaa2
..
8678eb2
100644
(file)
--- a/
arch/arm/lib/ecard.S
+++ b/
arch/arm/lib/ecard.S
@@
-12,7
+12,7
@@
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#define CPSR2SPSR(rt) \
mrs rt, cpsr; \