* [PATCH] 11: 2.5.29-8390
@ 2002-08-03 22:31 Russell King
0 siblings, 0 replies; only message in thread
From: Russell King @ 2002-08-03 22:31 UTC (permalink / raw)
To: Linus Torvalds, Paul Gortmaker; +Cc: linux-kernel
This patch has been verified to apply cleanly to 2.5.30
Unfortunately, someone changed the inb and friends definitions and
broke ARM. This patch allows ARM to build NE2000 based drivers
again.
drivers/net/8390.h | 5 +++--
1 files changed, 3 insertions, 2 deletions
diff -urN orig/drivers/net/8390.h linux/drivers/net/8390.h
--- orig/drivers/net/8390.h Thu Jul 25 20:13:31 2002
+++ linux/drivers/net/8390.h Sat Jul 27 14:57:02 2002
@@ -111,8 +111,7 @@
#if defined(CONFIG_MAC) || \
defined(CONFIG_ARIADNE2) || defined(CONFIG_ARIADNE2_MODULE) || \
- defined(CONFIG_HYDRA) || defined(CONFIG_HYDRA_MODULE) || \
- defined(CONFIG_ARM_ETHERH) || defined(CONFIG_ARM_ETHERH_MODULE)
+ defined(CONFIG_HYDRA) || defined(CONFIG_HYDRA_MODULE)
#define EI_SHIFT(x) (ei_local->reg_offset[x])
#undef inb
#undef inb_p
@@ -124,6 +123,8 @@
#define inb_p(port) in_8(port)
#define outb_p(val,port) out_8(port,val)
+#elif defined(CONFIG_ARM_ETHERH) || defined(CONFIG_ARM_ETHERH_MODULE)
+#define EI_SHIFT(x) (ei_local->reg_offset[x])
#else
#define EI_SHIFT(x) (x)
#endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2002-08-03 22:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-08-03 22:31 [PATCH] 11: 2.5.29-8390 Russell King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®