From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 1 Jul 2011 03:00:21 +0000 (+1000)
Subject: powerpc: Fix build problem with default ppc_md.progress commit
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9def247a7076bcced342a9783da79f2e0b0a3f47;p=mv-sheeva.git

powerpc: Fix build problem with default ppc_md.progress commit

a9c0f41b3a64955fd6f4e9d66ae1df1cbdee0cd0 breaks the build
on some platforms. The extern declaration must be shielded
against assembly.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/asm/setup.h
index c77cb7a7f4d..186e0fb835b 100644
--- a/arch/powerpc/include/asm/setup.h
+++ b/arch/powerpc/include/asm/setup.h
@@ -3,6 +3,8 @@
 
 #include <asm-generic/setup.h>
 
+#ifndef __ASSEMBLY__
 extern void ppc_printk_progress(char *s, unsigned short hex);
+#endif
 
 #endif	/* _ASM_POWERPC_SETUP_H */