Merge branch 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/p…

…ub/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
pinh3ad · Mar 28, 2012 · 88b4868 · 88b4868
2 parents b521d92 + 7175f80
commit 88b4868
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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"