[U-Boot,v2,05/25] arch/powerpc/include/asm/io.h: fix warning: preprocessor token __iomem redefined

Message ID 1351553687-12469-6-git-send-email-kim.phillips@freescale.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Kim Phillips Oct. 29, 2012, 11:34 p.m.
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 <kim.phillips@freescale.com>
v2: no change

 arch/powerpc/include/asm/io.h | 1 -
 1 file changed, 1 deletion(-)


diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index 9e20861..1f12c29 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)