Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8a02b2d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: sdhci-msm: remove support for Qualcomm chipsets" into msm-4.9

parents 71fab9fe 5209be96

drivers/mmc/host/Kconfig

+6 −11
Original line number Diff line number Diff line
@@ -395,18 +395,13 @@ config MMC_ATMELMCI 


	  If unsure, say N.



config MMC_SDHCI_MSM

	tristate "Qualcomm SDHCI Controller Support"

	depends on ARCH_QCOM || ARCH_MSM || (ARM && COMPILE_TEST)

	depends on MMC_SDHCI_PLTFM

config MMC_MSM

	tristate "Qualcomm SDCC Controller Support"

	depends on MMC && (ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50)

	help

	  This selects the Secure Digital Host Controller Interface (SDHCI)

	  support present in Qualcomm SOCs. The controller supports

	  SD/MMC/SDIO devices.



	  If you have a controller with this interface, say Y or M here.



	  If unsure, say N.

	  This provides support for the SD/MMC cell found in the

	  MSM and QSD SOCs from Qualcomm. The controller also has

	  support for SDIO devices.



config MMC_MXC

	tristate "Freescale i.MX21/27/31 or MPC512x Multimedia Card support"

drivers/mmc/host/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ obj-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o 
obj-$(CONFIG_MMC_SDHCI_OF_HLWD)		+= sdhci-of-hlwd.o

obj-$(CONFIG_MMC_SDHCI_BCM_KONA)	+= sdhci-bcm-kona.o

obj-$(CONFIG_MMC_SDHCI_IPROC)		+= sdhci-iproc.o

obj-$(CONFIG_MMC_SDHCI_MSM)		+= sdhci-msm.o

obj-$(CONFIG_MMC_SDHCI_ST)		+= sdhci-st.o

obj-$(CONFIG_MMC_SDHCI_MICROCHIP_PIC32)	+= sdhci-pic32.o

obj-$(CONFIG_MMC_SDHCI_BRCMSTB)		+= sdhci-brcmstb.o

drivers/mmc/host/sdhci-msm.c

+0 −727

File changed.

Preview size limit exceeded, changes collapsed.