diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 08:06:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-12 08:06:28 +0200 |
| commit | 5ff2241dd42ade03572753f9ed7743719b47c474 (patch) | |
| tree | 3e4d2fbf7e4bbb7de3675800856572e93a67a703 /drivers | |
| parent | mlx4: Fix infiniband Kconfig dependencies. (diff) | |
| download | linux-5ff2241dd42ade03572753f9ed7743719b47c474.tar.xz linux-5ff2241dd42ade03572753f9ed7743719b47c474.zip | |
spider_net: fix compile issue introduced by driver move
Both Spider net driver and Sun GEM driver use the sungem_phy.o object.
This fix creates a Kconfig object for sungem_phy (like MDIO) so that
both drivers require the SUNGEM_PHY object.
This has been compile tested for the Sun GEM driver.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/net/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/sun/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/sun/Makefile | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index e6be7123f9ca..c8779c13af89 100644 --- a/drivers/net/Kconfig +++ b/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/drivers/net/Makefile b/drivers/net/Makefile index d15107598e6d..db888b0bcd5d 100644 --- a/drivers/net/Makefile +++ b/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/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig index 87b17a7e6dfe..5132fa69047a 100644 --- a/drivers/net/ethernet/sun/Kconfig +++ b/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/drivers/net/ethernet/sun/Makefile b/drivers/net/ethernet/sun/Makefile index 4f25217a75f8..6e25dad6070e 100644 --- a/drivers/net/ethernet/sun/Makefile +++ b/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 |