From: Kim Phillips Date: Mon, 29 Oct 2012 13:34:27 +0000 (+0000) Subject: arch/powerpc/include/asm/io.h: fix warning: preprocessor token __iomem redefined X-Git-Tag: v2013.01-rc1~23 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cdfdb8d7f300cbe42fc22af75efd142644ee9373;p=u-boot arch/powerpc/include/asm/io.h: fix warning: preprocessor token __iomem redefined a fixup __iomem definition in arch code appears to be placed there as a cover up from a code import from linux when u-boot didn't yet have a compiler.h, introduced by commit 812711ce6b3a386125dcf0d6a59588e461abbb87 "Implement __raw_{read,write}[bwl] on all architectures". git show 812711ce6b3a386125dcf0d6a59588e461abbb87:include/linux/compiler.h fatal: Path 'include/linux/compiler.h' exists on disk, but not in '812711ce6b3a386125dcf0d6a59588e461abbb87'. Signed-off-by: Kim Phillips --- diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index 9e208618d9..1f12c29ba8 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -127,7 +127,6 @@ static inline void isync(void) /* * Non ordered and non-swapping "raw" accessors */ -#define __iomem #define PCI_FIX_ADDR(addr) (addr) static inline unsigned char __raw_readb(const volatile void __iomem *addr)