Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index a32f11f4adb0d5f8efa88874bfe3da1f30a61d4f..1b14bcf6cb811d97b18f06e135cc3489fa5715df 100644 (file)
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -27,8 +27,8 @@
 #include <linux/err.h>
 #include <linux/io.h>
 
-#include <asm/arch/clock.h>
-#include <asm/arch/board.h>
+#include <mach/clock.h>
+#include <mach/board.h>
 
 #include "prm.h"
 #include "cm.h"