Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6] / arch / arm / mach-pxa / eseries.c

diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index c29b7b21c11be82862accaa0c3aa7e9620b1d0b2..03942450885b14a94bf0dfa33e7c757a13544280 100644 (file)
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -14,7 +14,7 @@
 
 #include <asm/setup.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 
 #include "generic.h"