Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-h4-mmc.c

diff --git a/arch/arm/mach-omap2/board-h4-mmc.c b/arch/arm/mach-omap2/board-h4-mmc.c
index 84b3f4e9e7f601c8ea9550414216e2679fd92afa..0916a3ca5df3d6a8cabcb08a46417a4b6e2ad188 100644 (file)
--- a/arch/arm/mach-omap2/board-h4-mmc.c
+++ b/arch/arm/mach-omap2/board-h4-mmc.c
@@ -14,7 +14,7 @@
  * published by the Free Software Foundation.
  */
 
-#include <asm/arch/mmc.h>
+#include <mach/mmc.h>
 
 #include <asm/mach-types.h>
 #include <linux/delay.h>