Re: [patch 04/13] 8390: Split 8390 support into a pausing and a non pausing driver core
From: Andrew Morton <akpm@linux-foundation.org>
Date: 2008-06-10 00:20:24
On Mon, 9 Jun 2008 20:13:29 -0400 Alan Cox [off-list ref] wrote:
To be clearer on thisquoted
+obj-$(CONFIG_NE2_MCA) += ne2.o 8390.o 8390p.oThat line is wrong. Perhaps Andrew could post the original split patches instead ?
iirc this is your original, plus Randy's fix: From: Randy Dunlap <redacted> ne2 (MCA) needs both 8390.o and 8390p.o functions: drivers/built-in.o: In function `ne_close': ne2.c:(.text+0x30544): undefined reference to `eip_close' drivers/built-in.o: In function `ne_open': ne2.c:(.text+0x30554): undefined reference to `eip_open' drivers/built-in.o: In function `ne2_probe': (.init.text+0x1bce): undefined reference to `__alloc_eip_netdev' drivers/built-in.o: In function `ne2_probe': (.init.text+0x1dd9): undefined reference to `eip_interrupt' make[1]: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Randy Dunlap <redacted> Cc: Alan Cox <redacted> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- drivers/net/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/net/Makefile~8390-split-8390-support-into-a-pausing-and-a-non-pausing-driver-core-fix drivers/net/Makefile
--- a/drivers/net/Makefile~8390-split-8390-support-into-a-pausing-and-a-non-pausing-driver-core-fix
+++ a/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 +obj-$(CONFIG_NE2_MCA) += ne2.o 8390.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
_
quoted
diff -puN drivers/net/ne2.c~8390-split-8390-support-into-a-pausing-and-a-non-pausing-driver-core drivers/net/ne2.c--- a/drivers/net/ne2.c~8390-split-8390-support-into-a-pausing-and-a-non-pausing-driver-core +++ a/drivers/net/ne2.cAnd this has a single missed ei to eip conversion.
Where? Will that fix the build error?