Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0084a36 authored by Ingo Molnar's avatar Ingo Molnar Committed by Jeff Garzik
Browse files

net 8390p: fix interface usage 



various drivers were using the wrong APIs:

 drivers/built-in.o: In function `hp_probe1':
 hp.c:(.init.text+0xa280): undefined reference to `NS8390_init'

fixed via:

cd drivers/net/; sed -i 's/NS8390_/NS8390p_/g' \
  $(grep -l NS8390_ $(grep 8390p.o Makefile | cut -d' ' -f3 | \
      sed 's/.o$/.c/g'))

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent c7f80993

drivers/net/hp-plus.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr) 
	}



	outw(Perf_Page, ioaddr + HP_PAGING);

	NS8390_init(dev, 0);

	NS8390p_init(dev, 0);

	/* Leave the 8390 and HP chip reset. */

	outw(inw(ioaddr + HPP_OPTION) & ~EnableIRQ, ioaddr + HPP_OPTION);

drivers/net/hp.c

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static void __init 
hp_init_card(struct net_device *dev)

{

	int irq = dev->irq;

	NS8390_init(dev, 0);

	NS8390p_init(dev, 0);

	outb_p(irqmap[irq&0x0f] | HP_RUN,

		   dev->base_addr - NIC_OFFSET + HP_CONFIGURE);

	return;

drivers/net/ne.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) 
	}



	/* Read the 16 bytes of station address PROM.

	   We must first initialize registers, similar to NS8390_init(eifdev, 0).

	   We must first initialize registers, similar to NS8390p_init(eifdev, 0).

	   We can't reliably read the SAPROM address without this.

	   (I learned the hard way!). */

	{

drivers/net/ne2.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static int __init ne2_probe1(struct net_device *dev, int slot) 


	/* Read the 16 bytes of station address PROM.

	   We must first initialize registers, similar to

	   NS8390_init(eifdev, 0).

	   NS8390p_init(eifdev, 0).

	   We can't reliably read the SAPROM address without this.

	   (I learned the hard way!). */

	{