From:  <jgarzik@pretzel.yyz.us>
Date: Sat, 4 Jun 2005 21:54:39 +0000 (-0400)
Subject: Automatic merge of /spare/repo/netdev-2.6 branch skge
X-Git-Tag: v2.6.14-rc2~49^2~36^2~53^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2089a0d38bc9c2cdd084207ebf7082b18cf4bf58;p=linux-2.6-omap-h63xx.git

Automatic merge of /spare/repo/netdev-2.6 branch skge
---

2089a0d38bc9c2cdd084207ebf7082b18cf4bf58
diff --cc drivers/net/Makefile
index a8a65671805,43c441abeff..63c6d1e6d4d
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -51,8 -51,8 +51,9 @@@ obj-$(CONFIG_NS83820) += ns83820.
  obj-$(CONFIG_STNIC) += stnic.o 8390.o
  obj-$(CONFIG_FEALNX) += fealnx.o
  obj-$(CONFIG_TIGON3) += tg3.o
 +obj-$(CONFIG_BNX2) += bnx2.o
  obj-$(CONFIG_TC35815) += tc35815.o
+ obj-$(CONFIG_SKGE) += skge.o
  obj-$(CONFIG_SK98LIN) += sk98lin/
  obj-$(CONFIG_SKFP) += skfp/
  obj-$(CONFIG_VIA_RHINE) += via-rhine.o