projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[powerpc.git]
/
arch
/
alpha
/
kernel
/
sys_sio.c
diff --git
a/arch/alpha/kernel/sys_sio.c
b/arch/alpha/kernel/sys_sio.c
index
cd85ef7
..
a654014
100644
(file)
--- a/
arch/alpha/kernel/sys_sio.c
+++ b/
arch/alpha/kernel/sys_sio.c
@@
-16,7
+16,7
@@
#include <linux/sched.h>
#include <linux/pci.h>
#include <linux/init.h>
-#include <linux/
tty
.h>
+#include <linux/
screen_info
.h>
#include <asm/compiler.h>
#include <asm/ptrace.h>