From patchwork Mon May 27 16:18:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Belloni X-Patchwork-Id: 246617 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 8B8D62C0304 for ; Tue, 28 May 2013 02:20:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755238Ab3E0QUQ (ORCPT ); Mon, 27 May 2013 12:20:16 -0400 Received: from mail.free-electrons.com ([94.23.35.102]:52935 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754339Ab3E0QTT (ORCPT ); Mon, 27 May 2013 12:19:19 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id 29010E45; Mon, 27 May 2013 18:19:17 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost (128-79-216-144.hfc.dyn.abo.bbox.fr [128.79.216.144]) by mail.free-electrons.com (Postfix) with ESMTPSA id D2EC47BD; Mon, 27 May 2013 18:19:16 +0200 (CEST) From: Alexandre Belloni To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Russell King , Shawn Guo , Sascha Hauer , Alexandre Belloni Subject: [PATCH 2/3] arm: mxs: don't check for CONFIG_PHYLIB as builtin Date: Mon, 27 May 2013 18:18:43 +0200 Message-Id: <1369671524-14797-3-git-send-email-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1369671524-14797-1-git-send-email-alexandre.belloni@free-electrons.com> References: <1369671524-14797-1-git-send-email-alexandre.belloni@free-electrons.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexandre Belloni --- arch/arm/mach-mxs/mach-mxs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index 5b62b64..91c2bd2 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c @@ -273,9 +273,8 @@ static void __init apx4devkit_init(void) { enable_clk_enet_out(); - if (IS_BUILTIN(CONFIG_PHYLIB)) - phy_register_fixup_for_uid(PHY_ID_KSZ8051, MICREL_PHY_ID_MASK, - apx4devkit_phy_fixup); + phy_register_fixup_for_uid(PHY_ID_KSZ8051, MICREL_PHY_ID_MASK, + apx4devkit_phy_fixup); } #define ENET0_MDC__GPIO_4_0 MXS_GPIO_NR(4, 0)