Merge branch 'x86/fpu' into x86/urgent
[pandora-kernel.git] / arch / arm / mach-omap2 / serial.c
index e9c367f..adc8a26 100644 (file)
@@ -20,8 +20,8 @@
 
 #include <asm/io.h>
 
-#include <asm/arch/common.h>
-#include <asm/arch/board.h>
+#include <mach/common.h>
+#include <mach/board.h>
 
 static struct clk * uart1_ick = NULL;
 static struct clk * uart1_fck = NULL;