powerpc: Fix build problem with default ppc_md.progress commit
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 1 Jul 2011 03:00:21 +0000 (13:00 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 1 Jul 2011 03:00:21 +0000 (13:00 +1000)
a9c0f41b3a64955fd6f4e9d66ae1df1cbdee0cd0 breaks the build
on some platforms. The extern declaration must be shielded
against assembly.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/include/asm/setup.h

index c77cb7a..186e0fb 100644 (file)
@@ -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 */