[patch 2.6.18-rc3] build fixes: smc91x

From: David Brownell
Date: Mon Jul 31 2006 - 10:31:48 EST


Another driver that wouldn't build in mainline kernels for OMAP.

Unclear how these bugs arrived, presumably from incorrect cleanup of
the 16-bit-only paths, but smc91x wouldn't build for OMAP.

Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>

--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -189,16 +189,10 @@ SMC_outw(u16 val, void __iomem *ioaddr,
#define SMC_IO_SHIFT 0
#define SMC_NOWAIT 1

-#define SMC_inb(a, r) readb((a) + (r))
-#define SMC_outb(v, a, r) writeb(v, (a) + (r))
#define SMC_inw(a, r) readw((a) + (r))
#define SMC_outw(v, a, r) writew(v, (a) + (r))
#define SMC_insw(a, r, p, l) readsw((a) + (r), p, l)
#define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l)
-#define SMC_inl(a, r) readl((a) + (r))
-#define SMC_outl(v, a, r) writel(v, (a) + (r))
-#define SMC_insl(a, r, p, l) readsl((a) + (r), p, l)
-#define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l)

#include <asm/mach-types.h>
#include <asm/arch/cpu.h>