lkml.org 
[lkml]   [2012]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the arm-soc tree with the mmc tree
Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mmc/host/Kconfig between commit a334b9550294 ("mmc: remove imxmmc
driver") from the mmc tree and commits a21a92c0c787 ("mmc: Kconfig: remove
choice between at91_mci and atmel-mci") and 62080f06de6b ("mmc:
atmel-mci: remove the need for CONFIG_MMC_ATMELMCI_DMA") from the arm-soc
tree.

I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/mmc/host/Kconfig
index 9f1f5e2,4d15dff..0000000
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@@ -295,18 -288,16 +288,6 @@@ config MMC_ATMELMC

If unsure, say N.

- endchoice
- config MMC_ATMELMCI_DMA
- bool "Atmel MCI DMA support"
- depends on MMC_ATMELMCI && (AVR32 || ARCH_AT91SAM9G45) && DMA_ENGINE
- help
- Say Y here to have the Atmel MCI driver use a DMA engine to
- do data transfers and thus increase the throughput and
- reduce the CPU utilization.
- If unsure, say N.
-
-config MMC_IMX
- tristate "Motorola i.MX Multimedia Card Interface support"
- depends on ARCH_MX1
- help
- This selects the Motorola i.MX Multimedia card Interface.
- If you have a i.MX platform with a Multimedia Card slot,
- say Y or M here.
-
- If unsure, say N.
-
config MMC_MSM
tristate "Qualcomm SDCC Controller Support"
depends on MMC && ARCH_MSM
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-04-12 06:05    [W:0.033 / U:0.548 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site