]> git.sur5r.net Git - u-boot/commitdiff
net: sh-eth: fix inl and outl definitions
authorChris Brandt <chris.brandt@renesas.com>
Fri, 3 Nov 2017 13:30:11 +0000 (08:30 -0500)
committerJoe Hershberger <joe.hershberger@ni.com>
Mon, 15 Jan 2018 18:05:16 +0000 (12:05 -0600)
The macros inl and outl maybe already be defined from file
arch/arm/include/asm/io.h so there may be no reason to define them.
And if you do try defined them here, you get a redefined complier warning.

Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
drivers/net/sh_eth.h

index 3645f0eca7c42755d069c9745faa0eea703e28ea..2345c343689f8c33255adb64a0f25715de1f218d 100644 (file)
 #define ADDR_TO_PHY(addr)      ((int)(addr) & ~0xe0000000)
 #endif
 #elif defined(CONFIG_ARM)
-#define inl            readl
+#ifndef inl
+#define inl    readl
 #define outl   writel
+#endif
 #define ADDR_TO_PHY(addr)      ((int)(addr))
 #define ADDR_TO_P2(addr)       (addr)
 #endif /* defined(CONFIG_SH) */