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 branches 'sh/serial-rework' and 'sh/oprofile'
[pandora-kernel.git]
/
arch
/
arm
/
plat-iop
/
i2c.c
diff --git
a/arch/arm/plat-iop/i2c.c
b/arch/arm/plat-iop/i2c.c
index
6dcbcc4
..
4efe392
100644
(file)
--- a/
arch/arm/plat-iop/i2c.c
+++ b/
arch/arm/plat-iop/i2c.c
@@
-18,7
+18,7
@@
#include <linux/serial.h>
#include <linux/tty.h>
#include <linux/serial_core.h>
-#include <
asm
/io.h>
+#include <
linux
/io.h>
#include <asm/pgtable.h>
#include <asm/page.h>
#include <asm/mach/map.h>