Re: [patch 04/13] 8390: Split 8390 support into a pausing and a non pausing driver core

[Alan Cox <alan@lxorguk.ukuu.org.uk>]

On Mon, 9 Jun 2008 17:19:45 -0700
Andrew Morton <akpm@linux-foundation.org> wrote:

> On Mon, 9 Jun 2008 20:13:29 -0400
> Alan Cox <alan@redhat.com> wrote:
> 
> > To be clearer on this
> > 
> > > +obj-$(CONFIG_NE2_MCA) += ne2.o 8390.o 8390p.o
> > 
> > That line is wrong. Perhaps Andrew could post the original split patches
> > instead ?
> 
> iirc this is your original, plus Randy's fix:

This corrects Randy's fix. The ne2.c code you have is actually correct
just the Makefile wrong. Not sure where the original NAK/diff went but they
aren't in the lkml archive either so they obviously got eaten somewhere my
end.

8390: fix problems in the original split patch

From: Alan Cox <alan@redhat.com>

The split patch didn't fully convert the ne2 driver so it failed to link. At
some point this was fixed but the Makefile also got changed to incorrectly
link with both 8390 and 8390p. Only 8390p is needed so remove 8390.o references

Signed-off-by: Alan Cox <alan@redhat.com>
---

 drivers/net/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 41b239a..388cab8 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -107,7 +107,7 @@ obj-$(CONFIG_68360_ENET) += 68360enet.o
 obj-$(CONFIG_WD80x3) += wd.o 8390.o
 obj-$(CONFIG_EL2) += 3c503.o 8390p.o
 obj-$(CONFIG_NE2000) += ne.o 8390p.o
-obj-$(CONFIG_NE2_MCA) += ne2.o 8390.o 8390p.o
+obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o
 obj-$(CONFIG_HPLAN) += hp.o 8390p.o
 obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o
 obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o