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/bart/ide-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-iop
/
io.c
diff --git
a/arch/arm/plat-iop/io.c
b/arch/arm/plat-iop/io.c
index
39dcfb4
..
ed0bbec
100644
(file)
--- a/
arch/arm/plat-iop/io.c
+++ b/
arch/arm/plat-iop/io.c
@@
-18,8
+18,8
@@
*/
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/io.h>
void * __iomem __iop3xx_ioremap(unsigned long cookie, size_t size,
unsigned int mtype)