From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933390AbcJFSXQ (ORCPT ); Thu, 6 Oct 2016 14:23:16 -0400 Received: from mail-io0-f179.google.com ([209.85.223.179]:35927 "EHLO mail-io0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753343AbcJFSXM (ORCPT ); Thu, 6 Oct 2016 14:23:12 -0400 From: Laura Abbott To: Florian Fainelli , Andrew Lunn Cc: Laura Abbott , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" Subject: [PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry Date: Thu, 6 Oct 2016 11:22:51 -0700 Message-Id: <1475778171-10905-1-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org An extra entry for MDIO_XGENE got added during merging. Delete it. Reviewed-by: Andrew Lunn Signed-off-by: Laura Abbott --- 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