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 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-osiris.c
diff --git
a/arch/arm/mach-s3c2410/mach-osiris.c
b/arch/arm/mach-s3c2410/mach-osiris.c
index
a4ab144
..
37b4085
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-osiris.c
+++ b/
arch/arm/mach-s3c2410/mach-osiris.c
@@
-16,6
+16,7
@@
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/device.h>
+#include <linux/serial_core.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>