diff options
| author | Chris Brandt <chris.brandt@renesas.com> | 2017-11-03 08:30:11 -0500 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2018-01-15 12:05:16 -0600 |
| commit | 5ad565b0d1c10d6bdbf40c0264573e2044ab80fc (patch) | |
| tree | 9f35eed61f3131ab7fac3d51b413db578b20116e /drivers/net | |
| parent | ce27eb9b40594857a60cbff4763bc6a12e1118d3 (diff) | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/sh_eth.h | 4 |
1 files changed, 3 insertions, 1 deletions
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) */ |