Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/drivers/mmc/host
History
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
..
at91_mci.c mmc: fix comment typos 2012-09-01 09:52:48 -07:00
at91_mci.h
atmel-mci-regs.h mmc: atmel-mci: AP700x PDC is not connected to MCI 2012-10-03 10:05:23 -04:00
atmel-mci.c MMC highlights for 3.7: 2012-10-10 10:58:42 +09:00
au1xmmc.c
bfin_sdh.c mmc: bfin_sdh: Reset SD controller when resume from power saving mode. 2012-09-04 13:58:20 -04:00
cb710-mmc.c
cb710-mmc.h
davinci_mmc.c MMC highlights for 3.7: 2012-10-10 10:58:42 +09:00
dw_mmc-exynos.c mmc: dw_mmc: add support for exynos specific implementation of dw-mshc 2012-10-03 10:05:20 -04:00
dw_mmc-pci.c mmc: dw_mmc: convert copy of struct device in struct dw_mci to a reference 2012-10-03 10:05:13 -04:00
dw_mmc-pltfm.c mmc: dw_mmc: add support for implementation specific callbacks 2012-10-03 10:05:19 -04:00
dw_mmc-pltfm.h mmc: dw_mmc: add support for implementation specific callbacks 2012-10-03 10:05:19 -04:00
dw_mmc.c mmc: core: Fixup broken suspend and eMMC4.5 power off notify 2012-10-07 17:41:45 -04:00
dw_mmc.h mmc: dw_mmc: add support for implementation specific callbacks 2012-10-03 10:05:19 -04:00
jz4740_mmc.c
Kconfig mmc: dw_mmc: add support for exynos specific implementation of dw-mshc 2012-10-03 10:05:20 -04:00
Makefile mmc: dw_mmc: add support for exynos specific implementation of dw-mshc 2012-10-03 10:05:20 -04:00
mmc_spi.c mmc: mmc_spi: Use module_spi_driver 2012-09-04 13:58:29 -04:00
mmci.c mmc: mmci: use clk_prepare_enable and clk_disable_unprepare 2012-10-03 10:05:21 -04:00
mmci.h
msm_sdcc.c ARM: msm: move platform_data definitions 2012-09-14 11:17:35 +02:00
msm_sdcc.h
mvsdio.c ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
mvsdio.h
mxcmmc.c MMC highlights for 3.7: 2012-10-10 10:58:42 +09:00
mxs-mmc.c mmc: mxs-mmc: Fix merge issue causing build error 2012-10-11 17:21:40 -04:00
of_mmc_spi.c
omap.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
omap_hsmmc.c MMC highlights for 3.7: 2012-10-10 10:58:42 +09:00
pxamci.c MMC highlights for 3.7: 2012-10-10 10:58:42 +09:00
pxamci.h
s3cmci.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
s3cmci.h
sdhci-cns3xxx.c
sdhci-dove.c mmc: sdhci-dove: DT support for sdhci-dove 2012-09-04 13:58:15 -04:00
sdhci-esdhc-imx.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
sdhci-esdhc.h mmc: sdhci-esdhc: break out early if clock is 0 2012-09-04 13:58:06 -04:00
sdhci-of-esdhc.c mmc: eSDHC: Add ADMA mode support 2012-09-04 13:58:12 -04:00
sdhci-of-hlwd.c
sdhci-pci-data.c
sdhci-pci.c MMC highlights for 3.7: 2012-10-10 10:58:42 +09:00
sdhci-pltfm.c mmc: dt: Support "broken-cd" property in sdhci-pltfm 2012-10-07 17:41:42 -04:00
sdhci-pltfm.h
sdhci-pxav2.c mmc: sdhci-pxav2, sdhci-pxav3: use clk_prepare/unprepare APIs 2012-09-04 13:58:15 -04:00
sdhci-pxav3.c mmc: sdhci-pxav3: Use sdhci_get_of_property for parsing DT quirks 2012-10-07 17:41:42 -04:00
sdhci-s3c.c mmc: sdhci-s3c: Add clk_(enable/disable) in runtime suspend/resume 2012-10-07 17:41:43 -04:00
sdhci-spear.c mmc: sdhci-spear: Add clk_{un}prepare() support 2012-10-07 17:41:45 -04:00
sdhci-tegra.c ARM: SoC fixes 2012-10-11 10:21:48 +09:00
sdhci.c mmc: core: Fixup broken suspend and eMMC4.5 power off notify 2012-10-07 17:41:45 -04:00
sdhci.h mmc: sdhci: if MAX_CURRENT is 0, try getting current from regulator 2012-07-21 00:02:22 -04:00
sdricoh_cs.c
sh_mmcif.c mmc: sh-mmcif: avoid oops on spurious interrupts 2012-10-03 10:05:28 -04:00
sh_mobile_sdhi.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-07-24 17:12:54 -07:00
tifm_sd.c
tmio_mmc.c
tmio_mmc.h
tmio_mmc_dma.c
tmio_mmc_pio.c mmc: tmio: use generic GPIO CD and WP handlers 2012-07-21 00:02:20 -04:00
ushc.c
via-sdmmc.c mmc: via-sdmmc: Use module_pci_driver 2012-09-04 13:58:30 -04:00
vub300.c MMC highlights for 3.7: 2012-10-10 10:58:42 +09:00
wbsd.c
wbsd.h