From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 14 Sep 2005 12:01:25 +0000 (-0400)
Subject: Merge /spare/repo/linux-2.6/
X-Git-Tag: v2.6.16-rc1~169^2~16^2~32^2~97^2~21
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=d7f6884ae0ae6e406ec3500fcde16e8f51642460

Merge /spare/repo/linux-2.6/
---

d7f6884ae0ae6e406ec3500fcde16e8f51642460
diff --cc drivers/net/Makefile
index 7e5c0d46d505,8645c843cf4d..c849afc25c00
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -52,9 -54,10 +54,11 @@@ obj-$(CONFIG_STNIC) += stnic.o 8390.
  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
  obj-$(CONFIG_TC35815) += tc35815.o
  obj-$(CONFIG_SKGE) += skge.o
 +obj-$(CONFIG_SKY2) += sky2.o
  obj-$(CONFIG_SK98LIN) += sk98lin/
  obj-$(CONFIG_SKFP) += skfp/
  obj-$(CONFIG_VIA_RHINE) += via-rhine.o