projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bugzilla-11715' into test
[cascardo/linux.git]
/
arch
/
arm
/
mach-iop33x
/
iq80331.c
diff --git
a/arch/arm/mach-iop33x/iq80331.c
b/arch/arm/mach-iop33x/iq80331.c
index
c7d99f9
..
d51e10c
100644
(file)
--- a/
arch/arm/mach-iop33x/iq80331.c
+++ b/
arch/arm/mach-iop33x/iq80331.c
@@
-22,8
+22,8
@@
#include <linux/serial_8250.h>
#include <linux/mtd/physmap.h>
#include <linux/platform_device.h>
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>