projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6-block.git]
/
arch
/
arm
/
plat-omap
/
devices.c
diff --git
a/arch/arm/plat-omap/devices.c
b/arch/arm/plat-omap/devices.c
index 01da719a745366309dedb2a78ac17216dbbd342b..a716ecd1db2792ddc5760a039ccaa83f799c011e 100644
(file)
--- a/
arch/arm/plat-omap/devices.c
+++ b/
arch/arm/plat-omap/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>