From: Chris Brandt <chris.brandt@renesas.com>
Date: Fri, 3 Nov 2017 13:30:11 +0000 (-0500)
Subject: net: sh-eth: fix inl and outl definitions
X-Git-Tag: v2018.03-rc1~175^2~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5ad565b0d1c10d6bdbf40c0264573e2044ab80fc;p=oweals%2Fu-boot.git

net: sh-eth: fix inl and outl definitions

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>
---

diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
index 3645f0eca7..2345c34368 100644
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
@@ -25,8 +25,10 @@
 #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) */