diff --git a/[refs] b/[refs]
index 010e97b4a0d7..f85d05515d7e 100644
--- 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
index d9d8effe67f5..525d9bd35790 100644
--- 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/trunk/arch/arm/mach-vexpress/include/mach/debug-macro.S b/trunk/arch/arm/include/debug/vexpress.S
similarity index 100%
rename from trunk/arch/arm/mach-vexpress/include/mach/debug-macro.S
rename to trunk/arch/arm/include/debug/vexpress.S