summaryrefslogtreecommitdiff
path: root/include/net/gre.h
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-10-01 20:52:43 +0000
committerChris Ball <cjb@laptop.org>2012-10-11 17:21:40 -0400
commit4c5bb2e42e6f12c02e6c8db9883ffa7602c68c19 (patch)
treeacff967695ec87d899121818a3af1aa79bee541f /include/net/gre.h
parent12250d843e8489ee00b5b7726da855e51694e792 (diff)
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 'include/net/gre.h')
0 files changed, 0 insertions, 0 deletions