diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-11 23:06:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-11 23:06:28 -0700 |
| commit | 5ff2241dd42ade03572753f9ed7743719b47c474 (patch) | |
| tree | 3e4d2fbf7e4bbb7de3675800856572e93a67a703 /drivers/net/ethernet | |
| parent | af3dcd2f449b7243a4c7b987125ffc40fad262f0 (diff) | |
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/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/sun/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/sun/Makefile | 3 |
2 files changed, 3 insertions, 1 deletions
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 |