From patchwork Wed Aug 18 17:41:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 62065 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 DB8E6B70D6 for ; Thu, 19 Aug 2010 03:41:34 +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 1Olmdl-0000US-W1; Wed, 18 Aug 2010 18:41:30 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Olmdj-0000T5-QS for kernel-team@lists.ubuntu.com; Wed, 18 Aug 2010 18:41:27 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Olmdh-0001h3-Bd; Wed, 18 Aug 2010 18:41:25 +0100 Received: from host-208-74-128-122.dutchbros-02.cust.visp.net ([208.74.128.122] helo=localhost) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1Olmdg-0002S5-J3; Wed, 18 Aug 2010 18:41:25 +0100 From: leann.ogasawara@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/9] Revert "UBUNTU: [Config] [FTBS] sparc: Temporarily disable CONFIG_MTD_NAND_DENALI" Date: Wed, 18 Aug 2010 10:41:02 -0700 Message-Id: <236b9ccdcadabdb11d01f40f2e96318f049785aa.1282150973.git.leann.ogasawara@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: Cc: luke.yelavich@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 This reverts commit d52f956ff62ff765c27168ddd04315d0273ffc45. sparc is being decommissioned so drop this patch. Signed-off-by: Leann Ogasawara --- debian.master/config/config.common.ports | 1 + debian.master/config/ia64/config.common.ia64 | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/sparc/config.common.sparc | 1 - 4 files changed, 1 insertions(+), 3 deletions(-) diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index 5d9563a..5bf4f26 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -2103,6 +2103,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y CONFIG_MTD_MTDRAM=m CONFIG_MTD_NAND=m CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_DENALI=m CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018 CONFIG_MTD_NAND_DISKONCHIP=m # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64 index f3f3ae8..9112923 100644 --- a/debian.master/config/ia64/config.common.ia64 +++ b/debian.master/config/ia64/config.common.ia64 @@ -153,7 +153,6 @@ CONFIG_MINIX_SUBPARTITION=y # CONFIG_MMIO_NVRAM is not set CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_VSXXXAA=m -CONFIG_MTD_NAND_DENALI=m # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set CONFIG_MUTEX_SPIN_ON_OWNER=y # CONFIG_NCPFS_SMALLDOS is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 7cc85e4..d240868 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -137,7 +137,6 @@ CONFIG_MFD_JANZ_CMODIO=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_VSXXXAA=m -CONFIG_MTD_NAND_DENALI=m # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set # CONFIG_NCPFS_SMALLDOS is not set CONFIG_NET_IPGRE=m diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc index 6958b88..b7d1724 100644 --- a/debian.master/config/sparc/config.common.sparc +++ b/debian.master/config/sparc/config.common.sparc @@ -157,7 +157,6 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_MMIO_NVRAM is not set CONFIG_MOUSE_SERIAL=y # CONFIG_MOUSE_VSXXXAA is not set -# CONFIG_MTD_NAND_DENALI is not set CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y CONFIG_NCPFS_SMALLDOS=y CONFIG_NEED_DMA_MAP_STATE=y