lkml.org 
[lkml]   [2012]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the mfd tree with the mmc tree
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
tree.

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

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

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.
++
+ config MMC_REALTEK_PCI
+ 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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-12-07 05:01    [W:0.546 / U:0.300 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site