---

yaml --- r: 327101 b: refs/heads/master c: fa04e4d h: refs/heads/master i: 327099: 868c405 v: v3
git-mirror · Sep 14, 2012 · b8ffc71 · b8ffc71
1 parent 2c42a3a
commit b8ffc71
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e9bb084e85d7c160586faf91677a0d7798f1596
+refs/heads/master: fa04e4dbd3a0e68b9daf07a096db369b5a92f1bf
diff --git a/trunk/arch/arm/Kconfig.debug b/trunk/arch/arm/Kconfig.debug
@@ -377,6 +377,8 @@ config DEBUG_LL_INCLUDE
 	string
 	default "debug/icedcc.S" if DEBUG_ICEDCC
 	default "debug/highbank.S" if DEBUG_HIGHBANK_UART
+	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
+		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
 	default "mach/debug-macro.S"
 
 config EARLY_PRINTK

diff --git a/.../mach-vexpress/include/mach/debug-macro.S → trunk/arch/arm/include/debug/vexpress.S b/.../mach-vexpress/include/mach/debug-macro.S → trunk/arch/arm/include/debug/vexpress.S