Merge branch 'perf/urgent' into perf/core, to resolve a conflict

[sfrench/cifs-2.6.git] / arch / arm / mach-shmobile / pm-rcar.c

diff --git a/arch/arm/mach-shmobile/pm-rcar.c b/arch/arm/mach-shmobile/pm-rcar.c
index 4092ad16e0a42a266e5b7675e2d60662fd958417..0af05d288b09c3ab65b33e82713fb7a173a432cb 100644 (file)
--- a/arch/arm/mach-shmobile/pm-rcar.c
+++ b/arch/arm/mach-shmobile/pm-rcar.c
@@ -12,7 +12,7 @@
 #include <linux/err.h>
 #include <linux/mm.h>
 #include <linux/spinlock.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include "pm-rcar.h"
 
 /* SYSC Common */