From patchwork Mon Sep 18 12:59:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 112916 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp3633329qgf; Mon, 18 Sep 2017 05:59:29 -0700 (PDT) X-Received: by 10.84.225.134 with SMTP id u6mr35286519plj.177.1505739569166; Mon, 18 Sep 2017 05:59:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505739569; cv=none; d=google.com; s=arc-20160816; b=Zxh4Gi1a0rT2b0gHU6yINWEgLlw9f8xWvq7anxAYlQHd81E9vFmDiuEPW0VwzkpII4 PxDJQatjF9oPfSFiIXHRg6Ez+BWYbmePxAdR+iWhDrHVMGovYzSTdqahP6URDMrcCN9Y hh6xRDFOrGSSXunXf938lWMEVut+Sly7IDqLe6L/oyIKl1CCi6FX8O8Uq3OmuQNbK5cU JwZaIEjnZg17HX3mfiO5wGgQ+UpzhHpKHPiVZczfzaNFRmiPitbdZSbLQH6Eq3GpuvHF 0zod8BSYEKZNT50xUZ9lVJV7PogZsI+7CnSEW+h/+IWfey/cxIwC9kD0t7azpjByCuj6 KUnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=IksM6nbq0Bez9oNhE989dcLx8+/KyrRGay5iURIBON4=; b=krf5J6ZRL1l18kvyqt/wLKMmLYxkgJRw9NMfATYT9BDUbg+xvV/BYnCHk5lCgnyJgd sHMUExFER6tnIc4e/e2sGRg+i8agNnv1zR7aC/uGjN4m1NgSR+DA8xHXKhghBmZpb6Fj XO6jT9ltDtusCUboMXesqz+qpOo5sy18UVZFLeGho+f0SbSv+qYQe/0e8NPPMWbIZR5v MyBdrQrrTqlDROdP+lEruIOegdiGt1as9nq1bGDh086nQfEa7Gx1doV0Z0neWm1bHnVr U/mVmMW9aG3V1UPbmRkn5TQDp5VUmn/QbfZ75L4D1JHVmeKy2yqT0buoIS6As1PHngko 6LaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=ljrMulyg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g1si4582076pge.477.2017.09.18.05.59.28; Mon, 18 Sep 2017 05:59:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=ljrMulyg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754533AbdIRM70 (ORCPT + 26 others); Mon, 18 Sep 2017 08:59:26 -0400 Received: from mail-wr0-f174.google.com ([209.85.128.174]:49709 "EHLO mail-wr0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751711AbdIRM7Z (ORCPT ); Mon, 18 Sep 2017 08:59:25 -0400 Received: by mail-wr0-f174.google.com with SMTP id u96so407319wrb.6 for ; Mon, 18 Sep 2017 05:59:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=IksM6nbq0Bez9oNhE989dcLx8+/KyrRGay5iURIBON4=; b=ljrMulygexFM6mmoDENj2IwFMqrBVUUEQY1qTOqQjbs5pIOqD111NwEKKtUmlCYsGr JLsI4XsysC07N9aHwa6DI2Mm/6wiIEFxXp7uQuwLus5HIxvENCJkdgT2wBz/Bfl7ZzAE kH3HM3JzYQuACPImlJqxoJOw9Et9dqGQOG+YeWY5T4Sef0fghU6llA38mn+9cf0owYbp +n/huhRJNfvDYz0qVtg2O02I8D9DwuH24SDJc4b6ZnaZl6E6Oc059zC7iS0SQXCk4a9X ODGi1lAf5CgXLrAECJ7rMgaY9FE6B7Wspi5Tj1klJbEkhKvHY8FAo61XhhuRBRDAcgO9 Aa8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=IksM6nbq0Bez9oNhE989dcLx8+/KyrRGay5iURIBON4=; b=iLOAIAPnIuajtfDRX4zategA6vEnz5u53D7RcTcm9CdmynCZwlhyqql3Qq3ZXUBeUz +cqp7HjbLXSf9GaNCU6kjCraq9utAky4AwWw2KpTqraTZiXf0ePqdQe4j6wQW6YbC2Zl VWbbMbG4s32GvQcQEZPp0mGBWf5HtU0BRdeo7DtXsxbegTUDbi9b/u05tl/0Il2qsi+R tNfBUBD5AeqnttBRU7aW8+O4X2/gvRvtZZ1O/mmP4rr4KFAwemj32hsF1JfgISOcxl7v i+tjncMJxfsotPPlkniOaRwi1VXIF8Lrhmdh8AuFFBWOua/ZRq4TkJ5qpQOPLuyzONk/ mMHw== X-Gm-Message-State: AHPjjUgn0mYKkMOT4VsVXyBFiWUsjPH7scgpJUsInGA0XcHbEA69LUQ3 L34HKBEkKwnWTNYe9gw= X-Google-Smtp-Source: ADKCNb56z3KGtd4553nGDj0htBhuV7lgCdzKIHg5jmZJjf/HOBpvGIwJ+Kdb/DtE4s7PR7kIJ5AVDQ== X-Received: by 10.223.160.68 with SMTP id l4mr28018065wrl.79.1505739563899; Mon, 18 Sep 2017 05:59:23 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id f140sm6997136wmd.12.2017.09.18.05.59.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Sep 2017 05:59:23 -0700 (PDT) From: Jerome Brunet To: Andrew Lunn , Florian Fainelli Cc: Jerome Brunet , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Russell King Subject: [PATCH net] net: phy: Kconfig: Fix PHY infrastructure menu in menuconfig Date: Mon, 18 Sep 2017 14:59:20 +0200 Message-Id: <20170918125920.10298-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.13.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since the integration of PHYLINK, the configuration option which used to be under the PHY infrastructure menu in menuconfig ended up one level up (the network device driver section) By placing PHYLINK option right after PHYLIB entry, it broke the way Kconfig used to build the menu. See kconfig-language.txt, section "Menu structure", 2nd method. This is fixed by placing the PHYLINK option just before PHYLIB. Fixes: 9525ae83959b ("phylink: add phylink infrastructure") Signed-off-by: Jerome Brunet --- drivers/net/phy/Kconfig | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -- 2.13.5 diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index a9d16a3af514..cd931cf9dcc2 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -160,15 +160,6 @@ config MDIO_XGENE endif -menuconfig PHYLIB - tristate "PHY Device support and infrastructure" - depends on NETDEVICES - select MDIO_DEVICE - help - Ethernet controllers are usually attached to PHY - devices. This option provides infrastructure for - managing PHY devices. - config PHYLINK tristate depends on NETDEVICES @@ -179,6 +170,15 @@ config PHYLINK configuration links, PHYs, and Serdes links with MAC level autonegotiation modes. +menuconfig PHYLIB + tristate "PHY Device support and infrastructure" + depends on NETDEVICES + select MDIO_DEVICE + help + Ethernet controllers are usually attached to PHY + devices. This option provides infrastructure for + managing PHY devices. + if PHYLIB config SWPHY