aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/8390.h
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-10-09 19:19:36 -0400
committerJeff Garzik <jeff@garzik.org>2006-12-02 00:11:56 -0500
commit8c6270f957f0eaa343e4a609159c4b85038468d6 (patch)
tree7ee4305f931fefe2c80196b55395e522f59032f4 /drivers/net/8390.h
parent6c3561b0c1b64c8f0d1419f3909ab29f0eb98906 (diff)
[PATCH] 8390 fixes - m68k oddballs
more 8390 conversions - mac8390, zorro8390 and hydra got the same treatment as arm etherh; one more case in 8390.h ifdef cascade is gone. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/8390.h')
-rw-r--r--drivers/net/8390.h16
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/8390.h b/drivers/net/8390.h
index fae4aa92c4b7..b8991fc7923f 100644
--- a/drivers/net/8390.h
+++ b/drivers/net/8390.h
@@ -107,21 +107,7 @@ struct ei_device {
107 * - removed AMIGA_PCMCIA from this list, handled as ISA io now 107 * - removed AMIGA_PCMCIA from this list, handled as ISA io now
108 */ 108 */
109 109
110#if defined(CONFIG_MAC) || \ 110#if defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE)
111 defined(CONFIG_ZORRO8390) || defined(CONFIG_ZORRO8390_MODULE) || \
112 defined(CONFIG_HYDRA) || defined(CONFIG_HYDRA_MODULE)
113#define EI_SHIFT(x) (ei_local->reg_offset[x])
114#undef inb
115#undef inb_p
116#undef outb
117#undef outb_p
118
119#define ei_inb(port) in_8(port)
120#define ei_outb(val,port) out_8(port,val)
121#define ei_inb_p(port) in_8(port)
122#define ei_outb_p(val,port) out_8(port,val)
123
124#elif defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE)
125#define EI_SHIFT(x) (ei_local->reg_offset[x]) 111#define EI_SHIFT(x) (ei_local->reg_offset[x])
126#endif 112#endif
127 113