Merge branch 'linus' into x86/core

[linux-2.6-omap-h63xx.git] / arch / arm / mach-netx / xc.c

diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c
index ca9c5b61283acd5ebe1d7c3ecce9cbb53bfd6083..04c34e82fe6d7d172fdfb8754204932fc6cc8fbe 100644 (file)
--- a/arch/arm/mach-netx/xc.c
+++ b/arch/arm/mach-netx/xc.c
@@ -23,10 +23,10 @@
 #include <linux/mutex.h>
 
 #include <asm/io.h>
-#include <asm/hardware.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/hardware.h>
+#include <mach/netx-regs.h>
 
-#include <asm/arch/xc.h>
+#include <mach/xc.h>
 
 static DEFINE_MUTEX(xc_lock);