From: Florian Fainelli Date: Thu, 21 Mar 2019 23:23:30 +0000 (-0700) Subject: net: phy: Correct Cygnus/Omega PHY driver prompt X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a7a01ab312601ba5966ec80383e6bbef241d883f;p=linux.git net: phy: Correct Cygnus/Omega PHY driver prompt The tristate prompt should have been replaced rather than defined a few lines below, rebase mistake. Fixes: 17cc9821766c ("net: phy: Move Omega PHY entry to Cygnus PHY driver") Reported-by: Stephen Rothwell Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller --- diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 0973f0b81ce44..e493db5e8744b 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -270,10 +270,9 @@ config BCM87XX_PHY Currently supports the BCM8706 and BCM8727 10G Ethernet PHYs. config BCM_CYGNUS_PHY - tristate "Broadcom Cygnus SoC internal PHY" + tristate "Broadcom Cygnus/Omega SoC internal PHY" depends on ARCH_BCM_IPROC || COMPILE_TEST depends on MDIO_BCM_IPROC - tristate "Broadcom Cygnus/Omega SoC internal PHY" select BCM_NET_PHYLIB ---help--- This PHY driver is for the 1G internal PHYs of the Broadcom