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 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop13xx
/
io.c
diff --git
a/arch/arm/mach-iop13xx/io.c
b/arch/arm/mach-iop13xx/io.c
index
5b22fde
..
26cfa31
100644
(file)
--- a/
arch/arm/mach-iop13xx/io.c
+++ b/
arch/arm/mach-iop13xx/io.c
@@
-18,7
+18,7
@@
*/
#include <linux/kernel.h>
#include <linux/module.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/io.h>
void * __iomem __iop13xx_io(unsigned long io_addr)