linux-next: manual merge of the clk tree with the mmc tree
From: Stephen Rothwell
Date: Wed Jun 04 2014 - 03:10:42 EST
Today's linux-next merge of the clk tree got a conflict in
drivers/mmc/host/Kconfig between commit c7f6558d84af ("mmc: Add realtek
USB sdmmc host driver") from the mmc tree and commit 3cbcb16095f9
("mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi
SoCs") from the clk tree.
I fixed it up (see below) and can carry the fix as necessary (no action
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/mmc/host/Kconfig
@@@ -704,9 -695,9 +704,16 @@@ config MMC_REALTEK_PC
Say Y here to include driver code to support SD/MMC card interface
of Realtek PCI-E card reader
+ tristate "Realtek USB SD/MMC Card Interface Driver"
+ depends on MFD_RTSX_USB
+ Say Y here to include driver code to support SD/MMC card interface
+ of Realtek RTS5129/39 series card reader
+ config MMC_SUNXI
+ tristate "Allwinner sunxi SD/MMC Host Controller support"
+ depends on ARCH_SUNXI
+ This selects support for the SD/MMC Host Controller on
+ Allwinner sunxi SoCs.
Description: PGP signature