Merge commit 'v2.6.27-rc3' into x86/urgent

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-sa1100 / ssp.c

diff --git a/arch/arm/mach-sa1100/ssp.c b/arch/arm/mach-sa1100/ssp.c
index 06206ceb312ef5e4e0f79f274470ab3a0293003f..641f361c56f4858e15763a240e70909e80a08e7a 100644 (file)
--- a/arch/arm/mach-sa1100/ssp.c
+++ b/arch/arm/mach-sa1100/ssp.c
@@ -20,7 +20,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/ssp.h>
 
 #define TIMEOUT 100000