summaryrefslogtreecommitdiff
path: root/drivers/net/Makefile
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-10-10 00:19:36 +0100
committerJeff Garzik <jeff@garzik.org>2006-12-02 00:11:56 -0500
commit6c3561b0c1b64c8f0d1419f3909ab29f0eb98906 (patch)
treeb39e7aa75e9a9a9a6e7c394451a3ad52eb0d2444 /drivers/net/Makefile
parent865f3b2b6ac578a061c823bec5baf00ad04cbd8c (diff)
downloadlinux-3.10-6c3561b0c1b64c8f0d1419f3909ab29f0eb98906.tar.gz
linux-3.10-6c3561b0c1b64c8f0d1419f3909ab29f0eb98906.tar.bz2
linux-3.10-6c3561b0c1b64c8f0d1419f3909ab29f0eb98906.zip
[PATCH] beginning of 8390 fixes - generic and arm/etherh
etherh and a handful of other odd drivers use different macros when building 8390.c. Since we generate a single 8390.o and then link with it, in any config with both oddball and normal 8390-based driver we will end up with breakage in at least one of them. Solution: take most of 8390.c into lib8390.c and have 8390.c, etherh.c and the rest of oddballs #include it. Helper macros are taken from 8390.h to whoever includes lib8390.c. That way odd drivers get separate instances of compiled 8390 stuff and stop stepping on each other's toes. 8390.h gets cleaned up - we don't have the cascade of ifdefs in there and are left with the stuff that can be used by any 8390-based driver. Current problems are exactly because of that cascade - we attempt to choose the set of helpers by looking at config and that, of course, doesn't work well when we have several sets needed by various drivers in our config. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r--drivers/net/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f270bc49e57..53ccc337099 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -90,7 +90,6 @@ obj-$(CONFIG_HP100) += hp100.o
obj-$(CONFIG_SMC9194) += smc9194.o
obj-$(CONFIG_FEC) += fec.o
obj-$(CONFIG_68360_ENET) += 68360enet.o
-obj-$(CONFIG_ARM_ETHERH) += 8390.o
obj-$(CONFIG_WD80x3) += wd.o 8390.o
obj-$(CONFIG_EL2) += 3c503.o 8390.o
obj-$(CONFIG_NE2000) += ne.o 8390.o