diff mbox

[6/8] UBUNTU: [Config] Enable CONFIG_MMC_RICOH_MMC=y

Message ID 1274680601.24569.3507.camel@emiko
State Accepted
Delegated to: Leann Ogasawara
Headers show

Commit Message

Leann Ogasawara May 24, 2010, 5:56 a.m. UTC 
>From 71c6b6766ad73be76d03fca6176cce8c7737e5d9 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
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 <leann.ogasawara@canonical.com>
---
 debian.master/config/config.common.ports  |    2 +-
 debian.master/config/config.common.ubuntu |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox

Patch

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