aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/Kconfig.debug2
-rw-r--r--arch/arm/include/debug/vexpress.S (renamed from arch/arm/mach-vexpress/include/mach/debug-macro.S)0
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index d9d8effe67f5..525d9bd35790 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -377,6 +377,8 @@ config DEBUG_LL_INCLUDE
377 string 377 string
378 default "debug/icedcc.S" if DEBUG_ICEDCC 378 default "debug/icedcc.S" if DEBUG_ICEDCC
379 default "debug/highbank.S" if DEBUG_HIGHBANK_UART 379 default "debug/highbank.S" if DEBUG_HIGHBANK_UART
380 default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
381 DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
380 default "mach/debug-macro.S" 382 default "mach/debug-macro.S"
381 383
382config EARLY_PRINTK 384config EARLY_PRINTK
diff --git a/arch/arm/mach-vexpress/include/mach/debug-macro.S b/arch/arm/include/debug/vexpress.S
index 9f509f55d078..9f509f55d078 100644
--- a/arch/arm/mach-vexpress/include/mach/debug-macro.S
+++ b/arch/arm/include/debug/vexpress.S