summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-27 17:20:21 -0700
committerOlof Johansson <olof@lixom.net>2012-03-27 17:25:45 -0700
commit88b48684fe2d4f6207223423227c80d5408bccaf (patch)
tree856e9ce9f7b1ec5d94569925ac78c38daef71317 /arch/arm
parentb521d929b330d665cb3a42b26eaaa5690dc9dad7 (diff)
parent7175f80ba38a6b056508c4eadaab829593abbf2b (diff)
downloadblackbird-obmc-linux-88b48684fe2d4f6207223423227c80d5408bccaf.tar.gz
blackbird-obmc-linux-88b48684fe2d4f6207223423227c80d5408bccaf.zip
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
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-tegra/sleep.S4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
index 8f9fde161c34..5b20197bae7f 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"
OpenPOWER on IntegriCloud