projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'perf-urgent-for-linus' and 'perf-core-for-linus' of git://git.kernel...
[cascardo/linux.git]
/
arch
/
arm
/
mach-tegra
/
sleep.S
diff --git
a/arch/arm/mach-tegra/sleep.S
b/arch/arm/mach-tegra/sleep.S
index
8f9fde1
..
5b20197
100644
(file)
--- 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"