Merge branch 'topic/pcsp-fix' into topic/misc

[sfrench/cifs-2.6.git] / arch / arm / lib / ecard.S

diff --git a/arch/arm/lib/ecard.S b/arch/arm/lib/ecard.S
index 79cf247ad525d956a3b517fc307c71bd4d026551..8678eb2b7a60a21feaf0a74a919cf3a536dc3fd0 100644 (file)
--- a/arch/arm/lib/ecard.S
+++ b/arch/arm/lib/ecard.S
@@ -12,7 +12,7 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #define CPSR2SPSR(rt) \
                mrs     rt, cpsr; \