git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-pnx4008
/
sleep.S
diff --git
a/arch/arm/mach-pnx4008/sleep.S
b/arch/arm/mach-pnx4008/sleep.S
index
fea1e17
..
f4eed49
100644
(file)
--- a/
arch/arm/mach-pnx4008/sleep.S
+++ b/
arch/arm/mach-pnx4008/sleep.S
@@
-13,7
+13,7
@@
#include <linux/linkage.h>
#include <asm/assembler.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#define PWRMAN_VA_BASE IO_ADDRESS(PNX4008_PWRMAN_BASE)
#define PWR_CTRL_REG_OFFS 0x44