Kyle McMartin wrote:
From: Grant Grundler <[EMAIL PROTECTED]>
Include "tulip.h" in winbond-840.c and clean up lots of redundant
definitions.
Signed-off-by: Grant Grundler <[EMAIL PROTECTED]>
Signed-off-by: Kyle McMartin <[EMAIL PROTECTED]>
---
drivers/net/tulip/tulip.h | 17 ++++++----
drivers/net/tulip/tulip_core.c | 7 +---
drivers/net/tulip/winbond-840.c | 68 ++++++++++++++-------------------------
3 files changed, 37 insertions(+), 55 deletions(-)
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index d79c7ae..951af5e 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -30,11 +30,10 @@ #include <asm/irq.h>
/* undefine, or define to various debugging levels (>4 == obscene levels) */
#define TULIP_DEBUG 1
-/* undefine USE_IO_OPS for MMIO, define for PIO */
#ifdef CONFIG_TULIP_MMIO
-# undef USE_IO_OPS
+#define TULIP_BAR 1 /* CBMA */
#else
-# define USE_IO_OPS 1
+#define TULIP_BAR 0 /* CBIO */
#endif
OK except for two things:
1) should be split up into two patches: modify tulip, and modify winbond
2) nobody (but parisc folks?) knows what CBMA and CBIO mean. Just use
"MMIO" and "PIO"
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
