diff options
| author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2016-09-04 23:02:21 +0530 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-06 13:44:33 -0700 |
| commit | daa7ee8dfa64233789221685e73a6ef8159f80de (patch) | |
| tree | c4f29acb045ceb95fe35a9af3279ad694f46a1d0 | |
| parent | 007e4ba3ee137f4700f39aa6dbaf01a71047c5f6 (diff) | |
| download | linux-stable-daa7ee8dfa64233789221685e73a6ef8159f80de.tar.gz linux-stable-daa7ee8dfa64233789221685e73a6ef8159f80de.tar.bz2 linux-stable-daa7ee8dfa64233789221685e73a6ef8159f80de.zip | |
net: smsc: remove build warning of duplicate definition
The build of m32r was giving warning:
In file included from drivers/net/ethernet/smsc/smc91x.c:92:0:
drivers/net/ethernet/smsc/smc91x.h:448:0: warning: "SMC_inb" redefined
#define SMC_inb(ioaddr, reg) ({ BUG(); 0; })
drivers/net/ethernet/smsc/smc91x.h:106:0:
note: this is the location of the previous definition
#define SMC_inb(a, r) inb(((u32)a) + (r))
drivers/net/ethernet/smsc/smc91x.h:449:0: warning: "SMC_outb" redefined
#define SMC_outb(x, ioaddr, reg) BUG()
drivers/net/ethernet/smsc/smc91x.h:108:0:
note: this is the location of the previous definition
#define SMC_outb(v, a, r) outb(v, ((u32)a) + (r))
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/smsc/smc91x.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h index e17671c9d1b0..ea8465467469 100644 --- a/drivers/net/ethernet/smsc/smc91x.h +++ b/drivers/net/ethernet/smsc/smc91x.h @@ -470,7 +470,9 @@ smc_pxa_dma_insw(void __iomem *ioaddr, struct smc_local *lp, int reg, int dma, #endif #if ! SMC_CAN_USE_8BIT +#undef SMC_inb #define SMC_inb(ioaddr, reg) ({ BUG(); 0; }) +#undef SMC_outb #define SMC_outb(x, ioaddr, reg) BUG() #define SMC_insb(a, r, p, l) BUG() #define SMC_outsb(a, r, p, l) BUG() |