Hi, On Tue, Oct 09 2012, Arnd Bergmann wrote: > From all I can tell, 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:78: error: 'struct mxs_mmc_host' has no member > named 'base' > drivers/mmc/host/mxs-mmc.c:527:95: error: 'struct mxs_mmc_host' has no member > named 'devid' > > This does the obvious missing change. > > Signed-off-by: Arnd Bergmann <[email protected]> > Cc: Attila Kinali <[email protected]> > Cc: Lauri Hintsala <[email protected]> > Cc: Marek Vasut <[email protected]> > Cc: Chris Ball <[email protected]> > Cc: Shawn Guo <[email protected]> > Cc: Mark Brown <[email protected]> > > diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c > index bb4c2bf..80d1e6d 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); >
I'll send Marek's change to Linus once the main MMC merge has been pulled. Thanks, - Chris. -- Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
