summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2012-03-19 09:55:12 -0600
committerStephen Warren <swarren@wwwdotorg.org>2012-03-26 09:55:22 -0600
commit7175f80ba38a6b056508c4eadaab829593abbf2b (patch)
tree8b91b504c13f57ee95c7e58b19aafd86125ecdc0 /arch/arm
parent1ad105fc77e61f9dd7a272659a248e2979fdb893 (diff)
downloadop-kernel-dev-7175f80ba38a6b056508c4eadaab829593abbf2b.zip
op-kernel-dev-7175f80ba38a6b056508c4eadaab829593abbf2b.tar.gz
ARM: tegra: Include assembler.h in sleep.S to fix build break
Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's sleep.S to do so. This fixes: arch/arm/mach-tegra/sleep.S: Assembler messages: arch/arm/mach-tegra/sleep.S:77: Error: missing ')' arch/arm/mach-tegra/sleep.S:77: Error: garbage following instruction -- `movw r0,#:lower16:(0x60007000-0x60000000+IOMEM(0xFE200000))' Note: This only shows up after 0a25893 "ARM: tegra: update defconfig" Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
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 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"
OpenPOWER on IntegriCloud