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 git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-kirkwood
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-kirkwood/include/mach/debug-macro.S
b/arch/arm/mach-kirkwood/include/mach/debug-macro.S
index
c0cc5b5
..
a4a55c1
100644
(file)
--- a/
arch/arm/mach-kirkwood/include/mach/debug-macro.S
+++ b/
arch/arm/mach-kirkwood/include/mach/debug-macro.S
@@
-6,7
+6,7
@@
* published by the Free Software Foundation.
*/
-#include <mach/
kirkwood
.h>
+#include <mach/
bridge-regs
.h>
.macro addruart,rx
mrc p15, 0, \rx, c1, c0