]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
ARM: 7600/1: include CONFIG_DEBUG_LL_INCLUDE rather than mach/debug-macro.S
authorShawn Guo <shawn.guo@linaro.org>
Tue, 11 Dec 2012 06:06:37 +0000 (07:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 16 Dec 2012 10:04:23 +0000 (10:04 +0000)
Commit 91a9fec (ARM: move debug macros to common location) moves
arch/arm/kernel/debug.S and arch/arm/kernel/head.S to
CONFIG_DEBUG_LL_INCLUDE, but leaves arch/arm/boot/compressed/head.S
still with mach/debug-macro.S.  This causes the following build error
on platforms that moved to new DEBUG_LL inclusion mechanism, when
arch/arm/boot/compressed/head.S is compiled with DEBUG turned on.

  AS      arch/arm/boot/compressed/head.o
arch/arm/boot/compressed/head.S:49:30: fatal error: mach/debug-macro.S: No such file or directory
compilation terminated.

Fix the problem by replacing mach/debug-macro.S inclusion with
CONFIG_DEBUG_LL_INCLUDE one.

Reported-by: Steev Klimaszewski <steev@genesi-usa.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/boot/compressed/head.S

index 49ca86e37b8d3c0cbe2b0e84a5ab3abeacee6926..fe4d9c3ad761c8dfaadce6e214d709417947f396 100644 (file)
@@ -44,7 +44,7 @@
 
 #else
 
-#include <mach/debug-macro.S>
+#include CONFIG_DEBUG_LL_INCLUDE
 
                .macro  writeb, ch, rb
                senduart \ch, \rb