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 rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
setup.c
diff --git
a/arch/ia64/kernel/setup.c
b/arch/ia64/kernel/setup.c
index
6a33f41
..
7ad0d9c
100644
(file)
--- a/
arch/ia64/kernel/setup.c
+++ b/
arch/ia64/kernel/setup.c
@@
-35,7
+35,7
@@
#include <linux/seq_file.h>
#include <linux/string.h>
#include <linux/threads.h>
-#include <linux/
tty
.h>
+#include <linux/
screen_info
.h>
#include <linux/dmi.h>
#include <linux/serial.h>
#include <linux/serial_core.h>