ARM: tegra: Include assembler.h in sleep.S to fix build break
authorStephen Warren <swarren@wwwdotorg.org>
Mon, 19 Mar 2012 15:55:12 +0000 (09:55 -0600)
committerStephen Warren <swarren@wwwdotorg.org>
Mon, 26 Mar 2012 15:55:22 +0000 (09:55 -0600)
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>
arch/arm/mach-tegra/sleep.S

index 8f9fde1..5b20197 100644 (file)
@@ -23,7 +23,9 @@
  */
 
 #include <linux/linkage.h>
-#include <mach/io.h>
+
+#include <asm/assembler.h>
+
 #include <mach/iomap.h>
 
 #include "flowctrl.h"