diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:07:40 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:07:40 +0900 |
| commit | 125aae1d7f51ee28d821a1374a2b7be13972c5dc (patch) | |
| tree | cd366e9940f8fdff1c8dc23eaac2ec9b272b9fa3 /drivers | |
| parent | 79c63eeb805d086f52e5efda9c8d321beeed0b2b (diff) | |
| parent | 60fe5771be6aa3f37d5887aa01c04f733130a559 (diff) | |
Merge tag 'mmc-merge-for-3.7-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
Pull two more mmc changes from Chris Ball:
- Disintegrate UAPI
- fix a mismerge that caused a build error.
* tag 'mmc-merge-for-3.7-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
UAPI: (Scripted) Disintegrate include/linux/mmc
mmc: mxs-mmc: Fix merge issue causing build error
Diffstat (limited to 'drivers')
| -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); |