Merge branch 'linus' into x86/tracehook

[linux-2.6-omap-h63xx.git] / arch / arm / mach-orion5x / rd88f5181l-fxo-setup.c

diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
index 73e9242da7ad3e0973d3373f98ccc83dd85690eb..e72fe1e065e825069547e166763f33adaf32b3b1 100644 (file)
--- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@ -21,7 +21,7 @@
 #include <asm/leds.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
-#include <asm/arch/orion5x.h>
+#include <mach/orion5x.h>
 #include "common.h"
 #include "mpp.h"