diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-27 20:20:21 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-27 20:25:45 -0400 |
| commit | 88b48684fe2d4f6207223423227c80d5408bccaf (patch) | |
| tree | 856e9ce9f7b1ec5d94569925ac78c38daef71317 | |
| parent | b521d929b330d665cb3a42b26eaaa5690dc9dad7 (diff) | |
| parent | 7175f80ba38a6b056508c4eadaab829593abbf2b (diff) | |
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
| -rw-r--r-- | arch/arm/mach-tegra/sleep.S | 4 |
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 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/linkage.h> | 25 | #include <linux/linkage.h> |
| 26 | #include <mach/io.h> | 26 | |
| 27 | #include <asm/assembler.h> | ||
| 28 | |||
| 27 | #include <mach/iomap.h> | 29 | #include <mach/iomap.h> |
| 28 | 30 | ||
| 29 | #include "flowctrl.h" | 31 | #include "flowctrl.h" |