Skip to content

Commit

Permalink
ARM: 7600/1: include CONFIG_DEBUG_LL_INCLUDE rather than mach/debug-m…
Browse files Browse the repository at this point in the history 
…acro.S

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>
  • Loading branch information
Shawn Guo authored and Russell King committed Dec 16, 2012
1 parent 11520e5 commit 4beba08
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/boot/compressed/head.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

#else

#include <mach/debug-macro.S>
#include CONFIG_DEBUG_LL_INCLUDE

.macro writeb, ch, rb
senduart \ch, \rb
Expand Down

0 comments on commit 4beba08

Please sign in to comment.