Commit 9d38d28b authored by David S. Miller's avatar David S. Miller

Revert "net: smc91: fix crash regression on the versatile"

This reverts commit b268daff.

I applied the wrong version of this patch, the proper version
is coming up next.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b268daff
...@@ -46,8 +46,7 @@ ...@@ -46,8 +46,7 @@
defined(CONFIG_MACH_LITTLETON) ||\ defined(CONFIG_MACH_LITTLETON) ||\
defined(CONFIG_MACH_ZYLONITE2) ||\ defined(CONFIG_MACH_ZYLONITE2) ||\
defined(CONFIG_ARCH_VIPER) ||\ defined(CONFIG_ARCH_VIPER) ||\
defined(CONFIG_MACH_STARGATE2) ||\ defined(CONFIG_MACH_STARGATE2)
defined(CONFIG_ARCH_VERSATILE)
#include <asm/mach-types.h> #include <asm/mach-types.h>
...@@ -207,6 +206,23 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) ...@@ -207,6 +206,23 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
#define RPC_LSA_DEFAULT RPC_LED_TX_RX #define RPC_LSA_DEFAULT RPC_LED_TX_RX
#define RPC_LSB_DEFAULT RPC_LED_100_10 #define RPC_LSB_DEFAULT RPC_LED_100_10
#elif defined(CONFIG_ARCH_VERSATILE)
#define SMC_CAN_USE_8BIT 1
#define SMC_CAN_USE_16BIT 1
#define SMC_CAN_USE_32BIT 1
#define SMC_NOWAIT 1
#define SMC_inb(a, r) readb((a) + (r))
#define SMC_inw(a, r) readw((a) + (r))
#define SMC_inl(a, r) readl((a) + (r))
#define SMC_outb(v, a, r) writeb(v, (a) + (r))
#define SMC_outw(v, a, r) writew(v, (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)
#define SMC_IRQ_FLAGS (-1) /* from resource */
#elif defined(CONFIG_MN10300) #elif defined(CONFIG_MN10300)
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment