From patchwork Wed May 11 20:13:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 621253 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3r4nQs3rHYz9rxl for ; Thu, 12 May 2016 06:14:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752597AbcEKUOY (ORCPT ); Wed, 11 May 2016 16:14:24 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:54344 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752002AbcEKUOX (ORCPT ); Wed, 11 May 2016 16:14:23 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue003) with ESMTPA (Nemesis) id 0Mgrgq-1bDq5B1H0K-00M4FB; Wed, 11 May 2016 22:14:01 +0200 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , Gregory CLEMENT , Paul Gortmaker , Marcin Wojtas , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: mvneta: bm: fix dependencies again Date: Wed, 11 May 2016 22:13:23 +0200 Message-Id: <1462997636-1049487-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:9jm/QIuZPbA+XKLloF/5rdCYXr3XGIelq2koAoizjUiHWnSQ3qZ sGGPUuWy8Xdo6f0FQGhXTKsOzsLLJvNSTGTcvOhhku8h2ylqTsAk/SB0W/26n47uQtfgbFy pqghGxO8vZ68OONAhOusBZeR4j/pevHJFkKJrUhamRTL0DasoJ9BWSMBugixB/cuVwDfAvd HZkNwo1QIcGjYHvPTBaHg== X-UI-Out-Filterresults: notjunk:1; V01:K0:BqC8qGaiYcM=:YjvKX0Fz9PEsTWLVxWf2UO tr3254qVo75htaBpcbaB0rwn2ljxWmJD9ax0PiRVJKad/c0GUTILrEb33WVHXcHAa/ervC5xS oH5tLgehlo06l1YvyMbu9s6lPbUvgNTqFLsbJRhZd5EWbg18SA9F9br8yesywHjTZn1qdnC+m JnL9B+Uxn/Zf/ba6EPpZxu/pbbWSl55y4qScz1/uCNxXWmnEoAPRhhXBMGcObojZoXfIkeSLn rOVByRVOrtb6/JGAbNPg/cqnpnHoNoEyJGaNoap3UHAFPl0+e1YSbzlhLmIfIykG/lsvTlm7e X7buC2YyBq27kqZXfUO4HTDJMF/um+Td3WjCweVeMrTwkZ7IcYd/blVcfj4uuWGQou6l8uI23 hDlpTknLzkoGAkGlVBYW55W4TTeyQ+WAEVQpxowM0/AhGp5gmvh425Ulw9jgceCOPMP2wJGMJ iGRtbP0ISOwcmDZbD8pnUB+WPHhG6PI7qK+DbycgX/Cxm/AVK1mgwze6Ls1DdWOIOLJ2M4fdq eKWFwp/2iUwVeOoEJlnhdEobFbUAjSw5qrU6z25yLWpduTRB2nXAwrkwyEzq9kaHlZATrwB/e U8MmopOZ9+S51mnknx2LVXAotMzx2tesppLHw536HyJ/SYmYggPoTUkRP95Ubp21irtBqc1WL On0Le9zNCaRG2SzVGLb38P8w7JthhfkhNEZSCZwd4QNIYyyKrIKSVb8ViAlPYSduANZ4= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org I tried to fix this before, but my previous fix was incomplete and we can still get the same link error in randconfig builds because of the way that Kconfig treats the default y if MVNETA=y && MVNETA_BM_ENABLE line that does not actually trigger when MVNETA_BM_ENABLE=m, unlike I intended. Changing the line to use MVNETA_BM_ENABLE!=n however has the desired effect and hopefully makes all configurations work as expected. Signed-off-by: Arnd Bergmann Fixes: 019ded3aa7c9 ("net: mvneta: bm: clarify dependencies") Acked-by: Gregory CLEMENT --- drivers/net/ethernet/marvell/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig index b5c6d42daa12..2664827ddecd 100644 --- a/drivers/net/ethernet/marvell/Kconfig +++ b/drivers/net/ethernet/marvell/Kconfig @@ -68,7 +68,7 @@ config MVNETA config MVNETA_BM tristate - default y if MVNETA=y && MVNETA_BM_ENABLE + default y if MVNETA=y && MVNETA_BM_ENABLE!=n default MVNETA_BM_ENABLE select HWBM help