---

yaml --- r: 10276 b: refs/heads/master c: bb40dcb h: refs/heads/master v: v3
git-mirror · Sep 24, 2005 · 7becab2 · 7becab2
1 parent 8d744f9
commit 7becab2
Show file tree

Hide file tree

Showing 10 changed files with 434 additions and 1,252 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acc4b985a6f8f22a0e826692894a4af234764001
+refs/heads/master: bb40dcbb0fcebe1df08ba261483fcc38b307d063
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -2075,6 +2075,8 @@ config SPIDER_NET
 config GIANFAR
 	tristate "Gianfar Ethernet"
 	depends on 85xx || 83xx
+	select PHYLIB
+	select PHYCONTROL
 	help
 	  This driver supports the Gigabit TSEC on the MPC85xx 
 	  family of chips, and the FEC on the 8540

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -13,7 +13,7 @@ obj-$(CONFIG_CHELSIO_T1) += chelsio/
 obj-$(CONFIG_BONDING) += bonding/
 obj-$(CONFIG_GIANFAR) += gianfar_driver.o
 
-gianfar_driver-objs := gianfar.o gianfar_ethtool.o gianfar_phy.o
+gianfar_driver-objs := gianfar.o gianfar_ethtool.o gianfar_mii.o
 
 #
 # link order important here