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 'omap-all' into devel
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
devices.c
diff --git
a/arch/arm/mach-omap2/devices.c
b/arch/arm/mach-omap2/devices.c
index
7cca33e
..
90af2ac
100644
(file)
--- a/
arch/arm/mach-omap2/devices.c
+++ b/
arch/arm/mach-omap2/devices.c
@@
-13,9
+13,9
@@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <asm/mach-types.h>
#include <asm/mach/map.h>