Subject: don't link sungem_phy.o in twice This patch fixes a spidernet build issue found in 2.6.16-rc5-mm2. Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Index: linus-2.6/drivers/net/Makefile =================================================================== --- linus-2.6.orig/drivers/net/Makefile +++ linus-2.6/drivers/net/Makefile @@ -58,8 +58,8 @@ obj-$(CONFIG_STNIC) += stnic.o 8390.o obj-$(CONFIG_FEALNX) += fealnx.o obj-$(CONFIG_TIGON3) += tg3.o obj-$(CONFIG_BNX2) += bnx2.o -spidernet-y += spider_net.o spider_net_ethtool.o sungem_phy.o -obj-$(CONFIG_SPIDER_NET) += spidernet.o +spidernet-y += spider_net.o spider_net_ethtool.o +obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o obj-$(CONFIG_TC35815) += tc35815.o obj-$(CONFIG_SKGE) += skge.o obj-$(CONFIG_SKY2) += sky2.o