diff options
| author | Marek Vasut <marex@denx.de> | 2012-10-01 20:52:43 +0000 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-10-11 17:21:40 -0400 |
| commit | 4c5bb2e42e6f12c02e6c8db9883ffa7602c68c19 (patch) | |
| tree | acff967695ec87d899121818a3af1aa79bee541f /drivers/mmc | |
| parent | 12250d843e8489ee00b5b7726da855e51694e792 (diff) | |
| download | linux-4c5bb2e42e6f12c02e6c8db9883ffa7602c68c19.tar.gz linux-4c5bb2e42e6f12c02e6c8db9883ffa7602c68c19.tar.bz2 linux-4c5bb2e42e6f12c02e6c8db9883ffa7602c68c19.zip | |
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/mxs-mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index bb4c2bf04d09..80d1e6d4b0ae 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -525,7 +525,7 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET); writel(BM_SSP_CTRL1_SDIO_IRQ_EN, - host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET); + ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET); } else { writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR); |