projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6]
/
drivers
/
serial
/
sa1100.c
diff --git
a/drivers/serial/sa1100.c
b/drivers/serial/sa1100.c
index
b24a25e
..
94530f0
100644
(file)
--- a/
drivers/serial/sa1100.c
+++ b/
drivers/serial/sa1100.c
@@
-36,8
+36,8
@@
#include <linux/tty_flip.h>
#include <linux/serial_core.h>
#include <linux/serial.h>
+#include <linux/io.h>
-#include <asm/io.h>
#include <asm/irq.h>
#include <mach/hardware.h>
#include <asm/mach/serial_sa1100.h>