commit 88b48684fe2d4f6207223423227c80d5408bccaf
author Olof Johansson <olof@lixom.net> Tue Mar 27 17:20:21 2012 -0700
committer Olof Johansson <olof@lixom.net> Tue Mar 27 17:25:45 2012 -0700
tree 856e9ce9f7b1ec5d94569925ac78c38daef71317
parent b521d929b330d665cb3a42b26eaaa5690dc9dad7
parent 7175f80ba38a6b056508c4eadaab829593abbf2b

Merge branch 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup2

* 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: Include assembler.h in sleep.S to fix build break

arch/arm/mach-tegra/sleep.S

diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
index 8f9fde1..5b20197 100644
--- a/arch/arm/mach-tegra/sleep.S
+++ b/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"