Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/board-apollon-mmc.c b/arch/arm/mach-omap2/board-apollon-mmc.c
index f77167e1af004440e74e524120c331c7f4420ea0..71fccd9b3f3539bb6cfbcc1fea59affc2f75900c 100644 (file)
--- a/arch/arm/mach-omap2/board-apollon-mmc.c
+++ b/arch/arm/mach-omap2/board-apollon-mmc.c
@@ -11,8 +11,8 @@
 
 #include <linux/kernel.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/mmc.h>
+#include <mach/gpio.h>
+#include <mach/mmc.h>
 
 #ifdef CONFIG_MMC_OMAP