diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/smc91x.h | 37 |
2 files changed, 1 insertions, 38 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 23c13180ff14..5a6895320b48 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -914,7 +914,7 @@ config SMC91X | |||
914 | tristate "SMC 91C9x/91C1xxx support" | 914 | tristate "SMC 91C9x/91C1xxx support" |
915 | select CRC32 | 915 | select CRC32 |
916 | select MII | 916 | select MII |
917 | depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \ | 917 | depends on ARM || M32R || SUPERH || \ |
918 | MIPS || BLACKFIN || MN10300 || COLDFIRE | 918 | MIPS || BLACKFIN || MN10300 || COLDFIRE |
919 | help | 919 | help |
920 | This is a driver for SMC's 91x series of Ethernet chipsets, | 920 | This is a driver for SMC's 91x series of Ethernet chipsets, |
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 8d2772cc42f2..ee747919a766 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -83,43 +83,6 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) | |||
83 | } | 83 | } |
84 | } | 84 | } |
85 | 85 | ||
86 | #elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6) | ||
87 | |||
88 | /* We can only do 16-bit reads and writes in the static memory space. */ | ||
89 | #define SMC_CAN_USE_8BIT 0 | ||
90 | #define SMC_CAN_USE_16BIT 1 | ||
91 | #define SMC_CAN_USE_32BIT 0 | ||
92 | #define SMC_NOWAIT 1 | ||
93 | |||
94 | #define SMC_IO_SHIFT 0 | ||
95 | |||
96 | #define SMC_inw(a, r) in_be16((volatile u16 *)((a) + (r))) | ||
97 | #define SMC_outw(v, a, r) out_be16((volatile u16 *)((a) + (r)), v) | ||
98 | #define SMC_insw(a, r, p, l) \ | ||
99 | do { \ | ||
100 | unsigned long __port = (a) + (r); \ | ||
101 | u16 *__p = (u16 *)(p); \ | ||
102 | int __l = (l); \ | ||
103 | insw(__port, __p, __l); \ | ||
104 | while (__l > 0) { \ | ||
105 | *__p = swab16(*__p); \ | ||
106 | __p++; \ | ||
107 | __l--; \ | ||
108 | } \ | ||
109 | } while (0) | ||
110 | #define SMC_outsw(a, r, p, l) \ | ||
111 | do { \ | ||
112 | unsigned long __port = (a) + (r); \ | ||
113 | u16 *__p = (u16 *)(p); \ | ||
114 | int __l = (l); \ | ||
115 | while (__l > 0) { \ | ||
116 | /* Believe it or not, the swab isn't needed. */ \ | ||
117 | outw( /* swab16 */ (*__p++), __port); \ | ||
118 | __l--; \ | ||
119 | } \ | ||
120 | } while (0) | ||
121 | #define SMC_IRQ_FLAGS (0) | ||
122 | |||
123 | #elif defined(CONFIG_SA1100_PLEB) | 86 | #elif defined(CONFIG_SA1100_PLEB) |
124 | /* We can only do 16-bit reads and writes in the static memory space. */ | 87 | /* We can only do 16-bit reads and writes in the static memory space. */ |
125 | #define SMC_CAN_USE_8BIT 1 | 88 | #define SMC_CAN_USE_8BIT 1 |