From: Rob Herring Date: Fri, 31 Aug 2012 05:08:21 +0000 (-0500) Subject: ARM: vexpress: move debug macros to include/debug X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=fa04e4dbd3a0e68b9daf07a096db369b5a92f1bf;p=linux-edison.git ARM: vexpress: move debug macros to include/debug Move vexpress debug-macro.S over to common debug macro directory. Signed-off-by: Rob Herring Cc: Pawel Moll --- diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index d9d8effe67f..525d9bd3579 100644 --- a/arch/arm/Kconfig.debug +++ b/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/arch/arm/mach-vexpress/include/mach/debug-macro.S b/arch/arm/include/debug/vexpress.S similarity index 100% rename from arch/arm/mach-vexpress/include/mach/debug-macro.S rename to arch/arm/include/debug/vexpress.S