From patchwork Mon Mar 29 05:50:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 48805 X-Patchwork-Delegate: stefan.bader@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 25553B7C48 for ; Mon, 29 Mar 2010 16:51:09 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Nw7sO-0003g8-OZ; Mon, 29 Mar 2010 06:51:04 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Nw7sM-0003fF-NS for kernel-team@lists.ubuntu.com; Mon, 29 Mar 2010 06:51:02 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Nw7sJ-0006fi-4p for ; Mon, 29 Mar 2010 06:50:59 +0100 Received: from [218.82.238.146] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1Nw7sG-0007wC-Re for kernel-team@lists.ubuntu.com; Mon, 29 Mar 2010 06:50:59 +0100 From: Bryan Wu To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3] UBUNTU: [Config]: turn off CONFIG_FIXED_PHY for fsl-imx51 Date: Mon, 29 Mar 2010 13:50:06 +0800 Message-Id: <1269841807-12957-3-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1269841807-12957-1-git-send-email-bryan.wu@canonical.com> References: <1269841807-12957-1-git-send-email-bryan.wu@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/546649 When phylib is enabled in ethernet driver fec.c, there is a sysfs conflict with this built-in fixed phy driver. Since nobody is using this fixed phy driver in ARM based machine, it should be turned off. Signed-off-by: Bryan Wu Acked-by: Amit Kucheria Signed-off-by: Stefan Bader --- debian.fsl-imx51/config/config.common.ubuntu | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/debian.fsl-imx51/config/config.common.ubuntu b/debian.fsl-imx51/config/config.common.ubuntu index f6ba2ec..392a7f3 100644 --- a/debian.fsl-imx51/config/config.common.ubuntu +++ b/debian.fsl-imx51/config/config.common.ubuntu @@ -677,7 +677,7 @@ CONFIG_FIB_RULES=y CONFIG_FILE_LOCKING=y # CONFIG_FIRMWARE_EDID is not set CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_FIXED_PHY=y +# CONFIG_FIXED_PHY is not set CONFIG_FLATMEM=y CONFIG_FLATMEM_MANUAL=y CONFIG_FLAT_NODE_MEM_MAP=y