linux-next: manual merge of the mfd tree with the mmc tree

From: Stephen Rothwell
Date: Thu Dec 06 2012 - 22:24:12 EST

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mmc/host/Kconfig between commit 3a96dff0f828 ("mmc: SD/MMC Host
Controller for Wondermedia WM8505/WM8650") from the mmc tree and commit
ff984e57d36e ("mmc: Add realtek pcie sdmmc host driver") from the mfd

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/mmc/host/Kconfig
index 83eb1e0,dfa6d56..0000000
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@@ -602,13 -622,9 +602,20 @@@ config MMC_USH
Note: These controllers only support SDIO cards and do not
support MMC or SD memory cards.

+config MMC_WMT
+ tristate "Wondermedia SD/MMC Host Controller support"
+ depends on ARCH_VT8500
+ default y
+ help
+ This selects support for the SD/MMC Host Controller on
+ Wondermedia WM8505/WM8650 based SoCs.
+ To compile this driver as a module, choose M here: the
+ module will be called wmt-sdmmc.
+ tristate "Realtek PCI-E SD/MMC Card Interface Driver"
+ depends on MFD_RTSX_PCI
+ help
+ Say Y here to include driver code to support SD/MMC card interface
+ of Realtek PCI-E card reader

Attachment: pgp00000.pgp
Description: PGP signature