diff --git a/[refs] b/[refs]
index 3055b9c578cd..02819d42573f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45680995cd8ccf5eb71a1808eb96408589d37a26
+refs/heads/master: e91411b44d54db96c3d2d365b195b112e513d4ba
diff --git a/trunk/arch/arm/Kconfig.debug b/trunk/arch/arm/Kconfig.debug
index 9b31f4311ea2..057601e685e8 100644
--- a/trunk/arch/arm/Kconfig.debug
+++ b/trunk/arch/arm/Kconfig.debug
@@ -591,6 +591,7 @@ config DEBUG_LL_INCLUDE
 				 DEBUG_IMX6Q_UART
 	default "debug/highbank.S" if DEBUG_HIGHBANK_UART
 	default "debug/mvebu.S" if DEBUG_MVEBU_UART
+	default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
 	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
 	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
 	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
diff --git a/trunk/arch/arm/mach-mxs/include/mach/debug-macro.S b/trunk/arch/arm/include/debug/mxs.S
similarity index 100%
rename from trunk/arch/arm/mach-mxs/include/mach/debug-macro.S
rename to trunk/arch/arm/include/debug/mxs.S