[PATCH] 11: 2.5.29-8390

Unfortunately, someone changed the inb and friends definitions and
broke ARM.  This patch allows ARM to build NE2000 based drivers
again.

diff --git a/drivers/net/8390.h b/drivers/net/8390.h
index d201f13a463777b300f6ee011302b2fa5c3c6681..4debea1fd190c3ec3cf187b6a139038be3647709 100644 (file)
--- a/drivers/net/8390.h
+++ b/drivers/net/8390.h
@@ -111,8 +111,7 @@ struct ei_device {
  
 #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 @@ struct ei_device {
 #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