Re: [PATCH] mmc: mxs-mmc: Fix merge issue causing build error

2012-10-06 Thread Shawn Guo
Copy Chris who should be able to help send this fix for 3.7-rc. Shawn On Mon, Oct 01, 2012 at 10:52:43PM +0200, Marek Vasut wrote: The following error appeared due to trivial merge problem: drivers/mmc/host/mxs-mmc.c: In function 'mxs_mmc_enable_sdio_irq': drivers/mmc/host/mxs-mmc.c:527:3:

Re: [PATCH] mmc: mxs-mmc: Fix merge issue causing build error

2012-10-06 Thread Marek Vasut
Dear Shawn Guo, Copy Chris who should be able to help send this fix for 3.7-rc. Shawn Ok, thanks. Best regards, Marek Vasut -- To unsubscribe from this list: send the line unsubscribe linux-mmc in the body of a message to majord...@vger.kernel.org More majordomo info at

[PATCH] mmc: mxs-mmc: Fix merge issue causing build error

2012-10-01 Thread Marek Vasut
The following error appeared due to trivial merge problem: 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