Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / hsmmc.c

diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index e16d6c0504ff35910dc3ccfaf5d4f8a57943de7a..3805b930e0a85d35b85ef8febe71185b198a092d 100644 (file)
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -16,9 +16,9 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/i2c/twl4030.h>
-#include <asm/hardware.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/board.h>
+#include <mach/hardware.h>
+#include <mach/mmc.h>
+#include <mach/board.h>
 
 #if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)