Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / boot / compressed / head.S

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index d32b721eddb447bb98380250f305a960995b5221..137e97f765d913b7d0039b434f015008f644d5e9 100644 (file)
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -37,7 +37,7 @@
 
 #else
 
-#include <asm/arch/debug-macro.S>
+#include <mach/debug-macro.S>
 
                .macro  writeb, ch, rb
                senduart \ch, \rb