* linux-next: manual merge of the clk tree with the mmc tree
@ 2014-06-04 7:10 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2014-06-04 7:10 UTC (permalink / raw)
To: Mike Turquette, Chris Ball
Cc: linux-next, linux-kernel, Roger Tseng, David Lanzendörfer
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]
Hi Mike,
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
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/mmc/host/Kconfig
index fd4aab9b79e2,d50ac1ca11ea..000000000000
--- a/drivers/mmc/host/Kconfig
+++ b/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
+config MMC_REALTEK_USB
+ tristate "Realtek USB SD/MMC Card Interface Driver"
+ depends on MFD_RTSX_USB
+ help
+ 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
+ help
+ This selects support for the SD/MMC Host Controller on
+ Allwinner sunxi SoCs.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* linux-next: manual merge of the clk tree with the mmc tree
@ 2014-06-04 7:12 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2014-06-04 7:12 UTC (permalink / raw)
To: Mike Turquette, Chris Ball
Cc: linux-next, linux-kernel, Jonas Jensen, David Lanzendörfer,
Hans de Goede, Ulf Hansson
[-- Attachment #1: Type: text/plain, Size: 1119 bytes --]
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/mmc/host/Makefile between commit 1b66e94e6b99 ("mmc: moxart:
Add MOXA ART SD/MMC 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
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/mmc/host/Makefile
index 997912262499,3072bfb6d26a..000000000000
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@@ -50,10 -50,9 +50,11 @@@ obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.
obj-$(CONFIG_MMC_VUB300) += vub300.o
obj-$(CONFIG_MMC_USHC) += ushc.o
obj-$(CONFIG_MMC_WMT) += wmt-sdmmc.o
+obj-$(CONFIG_MMC_MOXART) += moxart-mmc.o
+ obj-$(CONFIG_MMC_SUNXI) += sunxi-mmc.o
obj-$(CONFIG_MMC_REALTEK_PCI) += rtsx_pci_sdmmc.o
+obj-$(CONFIG_MMC_REALTEK_USB) += rtsx_usb_sdmmc.o
obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o
obj-$(CONFIG_MMC_SDHCI_CNS3XXX) += sdhci-cns3xxx.o
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-04 7:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-04 7:10 linux-next: manual merge of the clk tree with the mmc tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-06-04 7:12 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox