diff --git a/[refs] b/[refs]
index 431f6e15fa43..f3941d67a201 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ad105fc77e61f9dd7a272659a248e2979fdb893
+refs/heads/master: 7175f80ba38a6b056508c4eadaab829593abbf2b
diff --git a/trunk/arch/arm/mach-tegra/sleep.S b/trunk/arch/arm/mach-tegra/sleep.S
index 8f9fde161c34..5b20197bae7f 100644
--- a/trunk/arch/arm/mach-tegra/sleep.S
+++ b/trunk/arch/arm/mach-tegra/sleep.S
@@ -23,7 +23,9 @@
  */
 
 #include <linux/linkage.h>
-#include <mach/io.h>
+
+#include <asm/assembler.h>
+
 #include <mach/iomap.h>
 
 #include "flowctrl.h"