mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
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>
This commit is contained in:
parent
af3dcd2f44
commit
5ff2241dd4
4 changed files with 8 additions and 2 deletions
|
@ -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"
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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>.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue