Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1496811 > unrolled thread

[PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry

Started byLaura Abbott <labbott@redhat.com>
First post2016-10-06 20:50 +0200
Last post2016-10-07 03:20 +0200
Articles 3 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry Laura Abbott <labbott@redhat.com> - 2016-10-06 20:50 +0200
    Re: [PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry Florian Fainelli <f.fainelli@gmail.com> - 2016-10-06 21:50 +0200
    Re: [PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry David Miller <davem@davemloft.net> - 2016-10-07 03:20 +0200

#1496811 — [PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry

FromLaura Abbott <labbott@redhat.com>
Date2016-10-06 20:50 +0200
Subject[PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry
Message-ID<splTY-4ES-9@gated-at.bofh.it>
An extra entry for MDIO_XGENE got added during merging.
Delete it.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
 drivers/net/phy/Kconfig | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 5078a0d..2651c8d 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -142,6 +142,7 @@ config MDIO_THUNDER
 
 config MDIO_XGENE
 	tristate "APM X-Gene SoC MDIO bus controller"
+	depends on ARCH_XGENE || COMPILE_TEST
 	help
 	  This module provides a driver for the MDIO busses found in the
 	  APM X-Gene SoC's.
@@ -320,13 +321,6 @@ config XILINX_GMII2RGMII
          the Reduced Gigabit Media Independent Interface(RGMII) between
          Ethernet physical media devices and the Gigabit Ethernet controller.
 
-config MDIO_XGENE
-	tristate "APM X-Gene SoC MDIO bus controller"
-	depends on ARCH_XGENE || COMPILE_TEST
-	help
-	  This module provides a driver for the MDIO busses found in the
-	  APM X-Gene SoC's.
-
 endif # PHYLIB
 
 config MICREL_KS8995MA
-- 
2.7.4

[toc] | [next] | [standalone]


#1496828

FromFlorian Fainelli <f.fainelli@gmail.com>
Date2016-10-06 21:50 +0200
Message-ID<spmQ1-5lG-5@gated-at.bofh.it>
In reply to#1496811

On 10/06/2016 11:22 AM, Laura Abbott wrote:
> An extra entry for MDIO_XGENE got added during merging.
> Delete it.
> 
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
> Signed-off-by: Laura Abbott <labbott@redhat.com>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

[toc] | [prev] | [next] | [standalone]


#1496957

FromDavid Miller <davem@davemloft.net>
Date2016-10-07 03:20 +0200
Message-ID<sprZo-Id-9@gated-at.bofh.it>
In reply to#1496811
From: Laura Abbott <labbott@redhat.com>
Date: Thu,  6 Oct 2016 11:22:51 -0700

> An extra entry for MDIO_XGENE got added during merging.
> Delete it.
> 
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
> Signed-off-by: Laura Abbott <labbott@redhat.com>

Applied, thanks.

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web