linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] MSM mmc_sdcc driver updates for 2.6.35-rc1
@ 2010-05-27 22:05 Daniel Walker
  0 siblings, 0 replies; only message in thread
From: Daniel Walker @ 2010-05-27 22:05 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, linux-arm-msm

Linus,

	Small fix for the msm-mmc_sdcc driver, fixing a compile failure with
MSM7x30.

Daniel

The following changes since commit 1cd2296909e77702c68021ede9d87a1d967a6a99:

  drivers: mmc: msm_sdcc: Add EMBEDDED_SDIO support (2010-03-18 13:37:24 -0700)

are available in the git repository at:
  git://codeaurora.org/quic/kernel/dwalker/linux-msm.git msm-mmc_sdcc

Daniel Walker (1):
      mmc: msm: fix compile error on MSM7x30

 drivers/mmc/host/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index ce1d288..6fc8eec 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -240,7 +240,7 @@ config MMC_IMX
 
 config MMC_MSM7X00A
 	tristate "Qualcomm MSM 7X00A SDCC Controller Support"
-	depends on MMC && ARCH_MSM
+	depends on MMC && ARCH_MSM && !ARCH_MSM7X30
 	help
 	  This provides support for the SD/MMC cell found in the
           MSM 7X00A controllers from Qualcomm.



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2010-05-27 22:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-27 22:05 [GIT PULL] MSM mmc_sdcc driver updates for 2.6.35-rc1 Daniel Walker

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).