git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/plat-mxc/include/mach/debug-macro.S
b/arch/arm/plat-mxc/include/mach/debug-macro.S
index 602768b427e2444f4f8f12154e12d67a19a0342a..4f773148bc2061bfa9913cf970eb836ea43abf37 100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/debug-macro.S
+++ b/
arch/arm/plat-mxc/include/mach/debug-macro.S
@@
-30,6
+30,9
@@
#endif
#ifdef CONFIG_MACH_MX31_3DS
#include <mach/board-mx31pdk.h>
+#endif
+#ifdef CONFIG_MACH_QONG
+#include <mach/board-qong.h>
#endif
.macro addruart,rx
mrc p15, 0, \rx, c1, c0