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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
[pandora-kernel.git]
/
drivers
/
serial
/
clps711x.c
diff --git
a/drivers/serial/clps711x.c
b/drivers/serial/clps711x.c
index
459f342
..
80e7642
100644
(file)
--- a/
drivers/serial/clps711x.c
+++ b/
drivers/serial/clps711x.c
@@
-38,9
+38,9
@@
#include <linux/tty_flip.h>
#include <linux/serial_core.h>
#include <linux/serial.h>
+#include <linux/io.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <asm/irq.h>
#include <asm/hardware/clps7111.h>