diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-07-01 13:00:21 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-07-01 13:00:21 +1000 |
| commit | 9def247a7076bcced342a9783da79f2e0b0a3f47 (patch) | |
| tree | d6d914bac70ea0eefcb6501a6b8a6b3334098409 /arch | |
| parent | a9c0f41b3a64955fd6f4e9d66ae1df1cbdee0cd0 (diff) | |
| download | op-kernel-dev-9def247a7076bcced342a9783da79f2e0b0a3f47.zip op-kernel-dev-9def247a7076bcced342a9783da79f2e0b0a3f47.tar.gz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/include/asm/setup.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/asm/setup.h index c77cb7a..186e0fb 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 */ |
