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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[cascardo/linux.git]
/
arch
/
arm
/
mach-iop32x
/
glantank.c
diff --git
a/arch/arm/mach-iop32x/glantank.c
b/arch/arm/mach-iop32x/glantank.c
index
45d6127
..
a9c2dfd
100644
(file)
--- a/
arch/arm/mach-iop32x/glantank.c
+++ b/
arch/arm/mach-iop32x/glantank.c
@@
-25,8
+25,8
@@
#include <linux/mtd/physmap.h>
#include <linux/i2c.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>