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 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
debug.S
diff --git
a/arch/arm/kernel/debug.S
b/arch/arm/kernel/debug.S
index
5617566
..
9550ff0
100644
(file)
--- a/
arch/arm/kernel/debug.S
+++ b/
arch/arm/kernel/debug.S
@@
-80,7
+80,7
@@
#endif /* CONFIG_CPU_V6 */
#else
-#include <
asm/ar
ch/debug-macro.S>
+#include <
ma
ch/debug-macro.S>
#endif /* CONFIG_DEBUG_ICEDCC */
/*