Commit 09188a07 authored by Russell King's avatar Russell King Committed by Linus Torvalds

[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.
parent a4d43929
...@@ -111,8 +111,7 @@ struct ei_device { ...@@ -111,8 +111,7 @@ struct ei_device {
#if defined(CONFIG_MAC) || \ #if defined(CONFIG_MAC) || \
defined(CONFIG_ARIADNE2) || defined(CONFIG_ARIADNE2_MODULE) || \ defined(CONFIG_ARIADNE2) || defined(CONFIG_ARIADNE2_MODULE) || \
defined(CONFIG_HYDRA) || defined(CONFIG_HYDRA_MODULE) || \ defined(CONFIG_HYDRA) || defined(CONFIG_HYDRA_MODULE)
defined(CONFIG_ARM_ETHERH) || defined(CONFIG_ARM_ETHERH_MODULE)
#define EI_SHIFT(x) (ei_local->reg_offset[x]) #define EI_SHIFT(x) (ei_local->reg_offset[x])
#undef inb #undef inb
#undef inb_p #undef inb_p
...@@ -124,6 +123,8 @@ struct ei_device { ...@@ -124,6 +123,8 @@ struct ei_device {
#define inb_p(port) in_8(port) #define inb_p(port) in_8(port)
#define outb_p(val,port) out_8(port,val) #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 #else
#define EI_SHIFT(x) (x) #define EI_SHIFT(x) (x)
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment