From patchwork Thu Sep 23 04:09:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Salveti de Araujo X-Patchwork-Id: 65509 X-Patchwork-Delegate: leann.ogasawara@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 736F6B70F4 for ; Thu, 23 Sep 2010 18:30:54 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OyhCY-0004Vn-B5; Thu, 23 Sep 2010 09:30:46 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Oyd8c-0007Gf-8G for kernel-team@lists.ubuntu.com; Thu, 23 Sep 2010 05:10:26 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Oyd8c-0008Pb-3r; Thu, 23 Sep 2010 05:10:26 +0100 Received: from [201.82.70.219] (helo=localhost.localdomain) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1Oyd8b-0005MQ-Dr; Thu, 23 Sep 2010 05:10:26 +0100 From: Ricardo Salveti de Araujo To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] Remove CONFIG_FIXED_PHY and move CONFIG_SMSC911X from m to y for omap Date: Thu, 23 Sep 2010 01:09:08 -0300 Message-Id: <1285214948-16019-2-git-send-email-ricardo.salveti@canonical.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1285214948-16019-1-git-send-email-ricardo.salveti@canonical.com> References: <1285214948-16019-1-git-send-email-ricardo.salveti@canonical.com> X-Mailman-Approved-At: Thu, 23 Sep 2010 09:30:45 +0100 Cc: Ricardo Salveti de Araujo 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/645689 Disable CONFIG_FIXED_PHY as it conflicts with other drivers (like smsc911x), as pointed by http://www.spinics.net/lists/netdev/msg140340.html. Then moving CONFIG_SMSC911X from module to built-in as it's a platform_driver and should be built-in to work properly with boards that contains the chip, like IGEPv2. Same solution already incorporated by Linaro's kernel at commit 91d9d38c40db6a177468e340c8c7a0277a984f5b. Signed-off-by: Ricardo Salveti de Araujo Acked-by: Bryan Wu Acked-by: Leann Ogasawara --- debian.master/config/amd64/config.common.amd64 | 2 ++ debian.master/config/armel/config.flavour.omap | 2 ++ .../config/armel/config.flavour.versatile | 2 ++ debian.master/config/config.common.ubuntu | 2 -- debian.master/config/i386/config.common.i386 | 2 ++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 374f404..ea071e8 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -45,6 +45,7 @@ CONFIG_FB_TILEBLITTING=y CONFIG_FB_UVESA=m CONFIG_FB_VESA=y CONFIG_FIRMWARE_EDID=y +CONFIG_FIXED_PHY=y # CONFIG_FLATMEM_MANUAL is not set # CONFIG_FONTS is not set CONFIG_FSAM7400=m @@ -189,6 +190,7 @@ CONFIG_SERIAL_UARTLITE=m # CONFIG_SLAB is not set CONFIG_SLIP=m CONFIG_SLUB=y +CONFIG_SMSC911X=m CONFIG_SND=m CONFIG_SND_ALI5451=m CONFIG_SND_EMU10K1_SEQ=m diff --git a/debian.master/config/armel/config.flavour.omap b/debian.master/config/armel/config.flavour.omap index 2405a19..cc38945 100644 --- a/debian.master/config/armel/config.flavour.omap +++ b/debian.master/config/armel/config.flavour.omap @@ -29,6 +29,7 @@ CONFIG_FB_S1D13XXX=m # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_UVESA is not set # CONFIG_FIRMWARE_EDID is not set +# CONFIG_FIXED_PHY is not set CONFIG_FTL=m CONFIG_GAMEPORT=m # CONFIG_GPIO_MAX732X is not set @@ -134,6 +135,7 @@ CONFIG_SERIAL_AMBA_PL011=m CONFIG_SLIP=y CONFIG_SLUB=y CONFIG_SMC91X=m +CONFIG_SMSC911X=y CONFIG_SND=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_MPU401=m diff --git a/debian.master/config/armel/config.flavour.versatile b/debian.master/config/armel/config.flavour.versatile index fe78875..d32c6bc 100644 --- a/debian.master/config/armel/config.flavour.versatile +++ b/debian.master/config/armel/config.flavour.versatile @@ -29,6 +29,7 @@ CONFIG_FB_SVGALIB=m CONFIG_FB_TILEBLITTING=y CONFIG_FB_UVESA=m CONFIG_FIRMWARE_EDID=y +CONFIG_FIXED_PHY=y # CONFIG_FTL is not set # CONFIG_GAMEPORT is not set CONFIG_GPIO_MAX732X=m @@ -134,6 +135,7 @@ CONFIG_SLAB=y CONFIG_SLIP=m # CONFIG_SLUB is not set CONFIG_SMC91X=y +CONFIG_SMSC911X=m CONFIG_SND=m # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_MPU401 is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index b5a4405..71325ce 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1409,7 +1409,6 @@ CONFIG_FIREWIRE_OHCI_DEBUG=y CONFIG_FIREWIRE_SBP2=m CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIRMWARE_MEMMAP=y -CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y @@ -3887,7 +3886,6 @@ CONFIG_SMCTR=m CONFIG_SMC_IRCC_FIR=m CONFIG_SMP=y CONFIG_SMSC37B787_WDT=m -CONFIG_SMSC911X=m CONFIG_SMSC9420=m CONFIG_SMSC_PHY=y CONFIG_SMSC_SCH311X_WDT=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index ab5ef95..7d65433 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -46,6 +46,7 @@ CONFIG_FB_TILEBLITTING=y CONFIG_FB_UVESA=m CONFIG_FB_VESA=y CONFIG_FIRMWARE_EDID=y +CONFIG_FIXED_PHY=y CONFIG_FLATMEM_MANUAL=y # CONFIG_FONTS is not set CONFIG_FSAM7400=m @@ -193,6 +194,7 @@ CONFIG_SERIAL_UARTLITE=m # CONFIG_SLAB is not set CONFIG_SLIP=m CONFIG_SLUB=y +CONFIG_SMSC911X=m CONFIG_SND=m CONFIG_SND_ALI5451=m CONFIG_SND_EMU10K1_SEQ=m