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 'linus' into timers/core
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
ocpi.c
diff --git
a/arch/arm/plat-omap/ocpi.c
b/arch/arm/plat-omap/ocpi.c
index
8bdbf97
..
ebe0c73
100644
(file)
--- a/
arch/arm/plat-omap/ocpi.c
+++ b/
arch/arm/plat-omap/ocpi.c
@@
-31,8
+31,8
@@
#include <linux/spinlock.h>
#include <linux/err.h>
#include <linux/clk.h>
+#include <linux/io.h>
-#include <asm/io.h>
#include <mach/hardware.h>
#define OCPI_BASE 0xfffec320