diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-08-31 07:03:46 +0200 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-09-14 16:22:00 +0200 |
| commit | 91a9fec022f5d98835e27d5307d487da3798040c (patch) | |
| tree | fa2e41ee6bd1ae9ecd04e468c9e8918fc9891be8 /arch/arm/kernel/head.S | |
| parent | ARM: make mach/gpio.h headers optional (diff) | |
| download | linux-91a9fec022f5d98835e27d5307d487da3798040c.tar.xz linux-91a9fec022f5d98835e27d5307d487da3798040c.zip | |
ARM: move debug macros to common location
Based on suggestion by Russell King, create a common location for debug
macros and select the included debug macro file using config option.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/head.S')
| -rw-r--r-- | arch/arm/kernel/head.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 3db960e20cb8..9874d0741191 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -23,8 +23,8 @@ #include <asm/thread_info.h> #include <asm/pgtable.h> -#ifdef CONFIG_DEBUG_LL -#include <mach/debug-macro.S> +#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_SEMIHOSTING) +#include CONFIG_DEBUG_LL_INCLUDE #endif /* |