Now that ax88796.c exports the ax_NS8390_init() symbol, we can include 8390.h instead of lib8390.c, avoiding duplication of that function and killing a few compile warnings in the bargain.
Signed-off-by: Michael Schmitz <[email protected]> --- drivers/net/ethernet/8390/xsurf100.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/8390/xsurf100.c b/drivers/net/ethernet/8390/xsurf100.c index 4c6f9cb..32caa5e 100644 --- a/drivers/net/ethernet/8390/xsurf100.c +++ b/drivers/net/ethernet/8390/xsurf100.c @@ -33,8 +33,6 @@ #define HW_CHIPID 0x70 #define HW_SCRATCH 0x78 -#define __NS8390_init ax_NS8390_init - /* force unsigned long back to 'void __iomem *' */ #define ax_convert_addr(_a) ((void __force __iomem *)(_a)) @@ -80,12 +78,10 @@ static void reg_write16(void __iomem *base, u16 reg, u16 val) writew(val, base + reg*4); } +#define NS8390_CORE +#include "8390.h" - -static unsigned char version[] = - "ax88796.c: Copyright 2005,2007 Simtec Electronics\n"; - -#include "lib8390.c" +extern void ax_NS8390_init(struct net_device *dev, int startp); /* from ne.c */ #define NE_CMD EI_SHIFT(0x00) -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-m68k" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
