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 git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-spear6xx
/
include
/
mach
/
hardware.h
diff --git
a/arch/arm/mach-spear6xx/include/mach/hardware.h
b/arch/arm/mach-spear6xx/include/mach/hardware.h
index
7545116
..
0b3f96a
100644
(file)
--- a/
arch/arm/mach-spear6xx/include/mach/hardware.h
+++ b/
arch/arm/mach-spear6xx/include/mach/hardware.h
@@
-14,8
+14,10
@@
#ifndef __MACH_HARDWARE_H
#define __MACH_HARDWARE_H
+#include <plat/hardware.h>
+#include <mach/spear.h>
+
/* Vitual to physical translation of statically mapped space */
#define IO_ADDRESS(x) (x | 0xF0000000)
#endif /* __MACH_HARDWARE_H */
-