projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream'
[powerpc.git]
/
include
/
asm-arm
/
arch-realview
/
debug-macro.S
diff --git
a/include/asm-arm/arch-realview/debug-macro.S
b/include/asm-arm/arch-realview/debug-macro.S
index
ed28bd0
..
017ad99
100644
(file)
--- a/
include/asm-arm/arch-realview/debug-macro.S
+++ b/
include/asm-arm/arch-realview/debug-macro.S
@@
-11,7
+11,7
@@
*
*/
-#include <
asm/hardware/amba_
serial.h>
+#include <
linux/amba/
serial.h>
.macro addruart,rx
mrc p15, 0, \rx, c1, c0