summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-footbridge
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-07-07 00:11:35 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-08-25 17:11:02 +0100
commit2facbc88733b34e1f992cde054c88b8e07607043 (patch)
tree5c0a61096777f07291b0e7db3c49a4d05441aa38 /arch/arm/mach-footbridge
parentc3faa9b7573bf8668869c0ef3075430dc9f053c6 (diff)
downloadblackbird-obmc-linux-2facbc88733b34e1f992cde054c88b8e07607043.tar.gz
blackbird-obmc-linux-2facbc88733b34e1f992cde054c88b8e07607043.zip
ARM: debug: move 8250 debug include into arch/arm/include/debug/
Now that the 8250 debug include can stand alone without requiring platforms to provide any macros, move it into the debug directory so it can be directly included. This allows us to get rid of a lot of debug-macros include files. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-footbridge')
-rw-r--r--arch/arm/mach-footbridge/include/mach/debug-macro.S4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-footbridge/include/mach/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S
index 553c47de578d..02247f313e94 100644
--- a/arch/arm/mach-footbridge/include/mach/debug-macro.S
+++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S
@@ -13,9 +13,6 @@
#include <asm/hardware/dec21285.h>
-#ifndef CONFIG_DEBUG_DC21285_PORT
-#include <asm/hardware/debug-8250.S>
-#else
#include <mach/hardware.h>
/* For EBSA285 debugging */
.equ dc21285_high, ARMCSR_BASE & 0xff000000
@@ -43,4 +40,3 @@
.macro waituart,rd,rx
.endm
-#endif
OpenPOWER on IntegriCloud