Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / mmc / host / omap_hsmmc.c

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index d5c1e9d7e6bd45d1436b7099d8e1b2a459e164da..70d8d78a2a468837a887d99210e642866ae01b4b 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -27,7 +27,7 @@
 #include <linux/mmc/host.h>
 #include <linux/io.h>
 #include <linux/semaphore.h>
-#include <asm/dma.h>
+#include <mach/dma.h>
 #include <mach/hardware.h>
 #include <mach/board.h>
 #include <mach/mmc.h>