* [PATCH net-next] net: phy: Correct Cygnus/Omega PHY driver prompt
@ 2019-03-21 23:23 Florian Fainelli
2019-03-24 0:54 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Florian Fainelli @ 2019-03-21 23:23 UTC (permalink / raw)
To: netdev
Cc: davem, Stephen Rothwell, Florian Fainelli, Andrew Lunn,
Heiner Kallweit, open list
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 <sfr@canb.auug.org.au>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/phy/Kconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 0973f0b81ce4..e493db5e8744 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
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: phy: Correct Cygnus/Omega PHY driver prompt
2019-03-21 23:23 [PATCH net-next] net: phy: Correct Cygnus/Omega PHY driver prompt Florian Fainelli
@ 2019-03-24 0:54 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-03-24 0:54 UTC (permalink / raw)
To: f.fainelli; +Cc: netdev, sfr, andrew, hkallweit1, linux-kernel
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Thu, 21 Mar 2019 16:23:30 -0700
> 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 <sfr@canb.auug.org.au>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Applied, thanks Florian.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-24 0:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-21 23:23 [PATCH net-next] net: phy: Correct Cygnus/Omega PHY driver prompt Florian Fainelli
2019-03-24 0:54 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.