---

yaml --- r: 265241 b: refs/heads/master c: 5ff2241 h: refs/heads/master i: 265239: 51ad85b v: v3
git-mirror · Aug 12, 2011 · b8070d4 · b8070d4
1 parent 9cc2f92
commit b8070d4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af3dcd2f449b7243a4c7b987125ffc40fad262f0
+refs/heads/master: 5ff2241dd42ade03572753f9ed7743719b47c474
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -934,6 +934,7 @@ config SPIDER_NET
 	tristate "Spider Gigabit Ethernet driver"
 	depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
 	select FW_LOADER
+	select SUNGEM_PHY
 	help
 	  This driver supports the Gigabit Ethernet chips present on the
 	  Cell Processor-Based Blades from IBM.
@@ -1083,6 +1084,9 @@ if NETDEV_10000
 config MDIO
 	tristate
 
+config SUNGEM_PHY
+	tristate
+
 endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -41,7 +41,7 @@ obj-$(CONFIG_R6040) += r6040.o
 obj-$(CONFIG_YELLOWFIN) += yellowfin.o
 obj-$(CONFIG_FEALNX) += fealnx.o
 spidernet-y += spider_net.o spider_net_ethtool.o
-obj-$(CONFIG_SPIDER_NET) += spidernet.o ethernet/sun/sungem_phy.o
+obj-$(CONFIG_SPIDER_NET) += spidernet.o
 obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
 gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
 ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)

diff --git a/trunk/drivers/net/ethernet/sun/Kconfig b/trunk/drivers/net/ethernet/sun/Kconfig
@@ -57,6 +57,7 @@ config SUNGEM
 	tristate "Sun GEM support"
 	depends on PCI
 	select CRC32
+	select SUNGEM_PHY
 	---help---
 	  Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0.  See also
 	  <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.

diff --git a/trunk/drivers/net/ethernet/sun/Makefile b/trunk/drivers/net/ethernet/sun/Makefile
@@ -5,7 +5,8 @@
 obj-$(CONFIG_HAPPYMEAL) += sunhme.o
 obj-$(CONFIG_SUNQE) += sunqe.o
 obj-$(CONFIG_SUNBMAC) += sunbmac.o
-obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
+obj-$(CONFIG_SUNGEM) += sungem.o
+obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o
 obj-$(CONFIG_CASSINI) += cassini.o
 obj-$(CONFIG_SUNVNET) += sunvnet.o
 obj-$(CONFIG_NIU) += niu.o