The following commit has been merged in the linux branch: commit af2bd9d534ca9f1ffdeb0780fb8508e71ed55803 Author: Uwe Kleine-König u.kleine-koenig@pengutronix.de Date: Wed Oct 21 09:46:59 2009 +0200
mmc: at91_mci: Don't include asm/mach/mmc.h
This fixes a compile bug introduced in
6ef297f (ARM: 5720/1: Move MMCI header to amba include dir)
That commit moved arch/arm/include/asm/mach/mmc.h to include/linux/amba/mmci.h. Just removing the include was enough.
Signed-off-by: Uwe Kleine-König u.kleine-koenig@pengutronix.de Acked-by: Linus Walleij linus.walleij@stericsson.com Acked-by: Nicolas Ferre nicolas.ferre@atmel.com Acked-by: Bill Gatliff bgat@billgatliff.com Cc: Catalin Marinas catalin.marinas@arm.com Cc: Russell King rmk+kernel@arm.linux.org.uk Cc: Pierre Ossman drzeus@drzeus.cx Cc: linux-arm-kernel@lists.infradead.org Cc: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index e556d42..63924e0 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c @@ -72,7 +72,6 @@ #include <asm/irq.h> #include <asm/gpio.h>
-#include <asm/mach/mmc.h> #include <mach/board.h> #include <mach/cpu.h> #include <mach/at91_mci.h>