Marek Vasut 4c5bb2e42e mmc: mxs-mmc: Fix merge issue causing build error ... The following error appeared due to a merge problem; the patches: fc108d24 "mmc: mxs-mmc: fix deadlock caused by recursion loop" 829c1bf4 "mmc: spi: Pull out parts shared between MMC and SPI" came in through separate branches and cause this build error when combined. drivers/mmc/host/mxs-mmc.c: In function 'mxs_mmc_enable_sdio_irq': drivers/mmc/host/mxs-mmc.c:527:3: error: 'struct mxs_mmc_host' has no member named 'base' drivers/mmc/host/mxs-mmc.c:527:3: error: 'struct mxs_mmc_host' has no member named 'devid' make[3]: *** [drivers/mmc/host/mxs-mmc.o] Error 1 This patch corrects the issue. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>		2012-10-11 17:21:40 -04:00
..
Kconfig	…
Makefile	…
at91_mci.c	…
at91_mci.h	…
atmel-mci-regs.h	…
atmel-mci.c	…
au1xmmc.c	…
bfin_sdh.c	…
cb710-mmc.c	…
cb710-mmc.h	…
davinci_mmc.c	…
dw_mmc-exynos.c	…
dw_mmc-pci.c	…
dw_mmc-pltfm.c	…
dw_mmc-pltfm.h	…
dw_mmc.c	…
dw_mmc.h	…
jz4740_mmc.c	…
mmc_spi.c	…
mmci.c	…
mmci.h	…
msm_sdcc.c	…
msm_sdcc.h	…
mvsdio.c	…
mvsdio.h	…
mxcmmc.c	…
mxs-mmc.c	…
of_mmc_spi.c	…
omap.c	…
omap_hsmmc.c	…
pxamci.c	…
pxamci.h	…
s3cmci.c	…
s3cmci.h	…
sdhci-cns3xxx.c	…
sdhci-dove.c	…
sdhci-esdhc-imx.c	…
sdhci-esdhc.h	…
sdhci-of-esdhc.c	…
sdhci-of-hlwd.c	…
sdhci-pci-data.c	…
sdhci-pci.c	…
sdhci-pltfm.c	…
sdhci-pltfm.h	…
sdhci-pxav2.c	…
sdhci-pxav3.c	…
sdhci-s3c.c	…
sdhci-spear.c	…
sdhci-tegra.c	…
sdhci.c	…
sdhci.h	…
sdricoh_cs.c	…
sh_mmcif.c	…
sh_mobile_sdhi.c	…
tifm_sd.c	…
tmio_mmc.c	…
tmio_mmc.h	…
tmio_mmc_dma.c	…
tmio_mmc_pio.c	…
ushc.c	…
via-sdmmc.c	…
vub300.c	…
wbsd.c	…
wbsd.h	…