From patchwork Wed Aug 18 17:41:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 62066 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 C168DB70D8 for ; Thu, 19 Aug 2010 03:41:39 +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 1Olmdq-0000Xf-M8; Wed, 18 Aug 2010 18:41:34 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Olmdo-0000W3-4q for kernel-team@lists.ubuntu.com; Wed, 18 Aug 2010 18:41:32 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Olmdk-0001lT-Pw; Wed, 18 Aug 2010 18:41:29 +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 1Olmdk-0002SC-1c; Wed, 18 Aug 2010 18:41:28 +0100 From: leann.ogasawara@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/9] Revert "UBUNTU: [Config] [FTBS] sparc: Temporarily disable CONFIG_MFD_JANZ_CMODIO" Date: Wed, 18 Aug 2010 10:41:03 -0700 Message-Id: <408e8638d6667f4a3ddcabe2287e7f085ba39bd1.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 211d44e81055e53003140d51b0d6c0b64a1e7180. 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 5bf4f26..8e158b3 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -1963,6 +1963,7 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y # CONFIG_MEMSTICK is not set CONFIG_MFD_88PM860X=y CONFIG_MFD_CORE=y +CONFIG_MFD_JANZ_CMODIO=m CONFIG_MFD_MAX8925=y CONFIG_MFD_MC13783=m CONFIG_MFD_PCF50633=m diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64 index 9112923..3bd5fcc 100644 --- a/debian.master/config/ia64/config.common.ia64 +++ b/debian.master/config/ia64/config.common.ia64 @@ -147,7 +147,6 @@ CONFIG_MAC80211_MESH=y # CONFIG_MACVLAN is not set CONFIG_MAC_PARTITION=y # CONFIG_MARKERS is not set -CONFIG_MFD_JANZ_CMODIO=m CONFIG_MFD_SM501_GPIO=y CONFIG_MINIX_SUBPARTITION=y # CONFIG_MMIO_NVRAM is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index d240868..a0856f6 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -132,7 +132,6 @@ CONFIG_MAC80211_MESH=y CONFIG_MACVLAN=m CONFIG_MAC_PARTITION=y CONFIG_MARKERS=y -CONFIG_MFD_JANZ_CMODIO=m # CONFIG_MFD_SM501_GPIO is not set CONFIG_MINIX_SUBPARTITION=y CONFIG_MOUSE_SERIAL=m diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc index b7d1724..ee219bf 100644 --- a/debian.master/config/sparc/config.common.sparc +++ b/debian.master/config/sparc/config.common.sparc @@ -151,7 +151,6 @@ CONFIG_LZO_COMPRESS=m CONFIG_MACVLAN=m # CONFIG_MAC_PARTITION is not set CONFIG_MARKERS=y -# CONFIG_MFD_JANZ_CMODIO is not set CONFIG_MFD_SM501_GPIO=y # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_MMIO_NVRAM is not set