From patchwork Mon May 24 05:56:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 53387 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 5EEB9B7D65 for ; Mon, 24 May 2010 15:56:50 +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 1OGQec-0000N1-7o; Mon, 24 May 2010 06:56:46 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OGQea-0000MX-RG for kernel-team@lists.ubuntu.com; Mon, 24 May 2010 06:56:44 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OGQea-000238-Nv for ; Mon, 24 May 2010 06:56:44 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OGQea-0006Yj-BQ for kernel-team@lists.ubuntu.com; Mon, 24 May 2010 06:56:44 +0100 Subject: [PATCH 6/8] UBUNTU: [Config] Enable CONFIG_MMC_RICOH_MMC=y From: Leann Ogasawara To: kernel-team In-Reply-To: <1274680312.24569.3479.camel@emiko> References: <1274680312.24569.3479.camel@emiko> Date: Sun, 23 May 2010 22:56:41 -0700 Message-ID: <1274680601.24569.3507.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 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: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com >From 71c6b6766ad73be76d03fca6176cce8c7737e5d9 Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Sun, 23 May 2010 12:04:40 -0700 Subject: [PATCH 6/8] UBUNTU: [Config] Enable CONFIG_MMC_RICOH_MMC=y Enable CONFIG_MMC_RICOH_MMC=y for ports and ubuntu. This option adds a pci quirk to disable Ricoh MMC Controller. This proprietary controller is unnecessary because the SDHCI driver supports MMC cards on the SD controller, but if it is not disabled, it will steal the MMC cards away - rendering them useless. It is safe to select this even if you don't have a Ricoh based card reader. Signed-off-by: Leann Ogasawara --- debian.master/config/config.common.ports | 2 +- debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index 7629986..d66f544 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -1917,7 +1917,7 @@ CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_RICOH_MMC is not set +CONFIG_MMC_RICOH_MMC=y CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER=y CONFIG_MMC_SDHCI_IO_ACCESSORS=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index fece061..dd83346 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2356,7 +2356,7 @@ CONFIG_MMC_ARMMMCI=y CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_RICOH_MMC is not set +CONFIG_MMC_RICOH_MMC=y CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_SDHCI_PLTFM=m