projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'from-linus' into upstream
[powerpc.git]
/
arch
/
cris
/
kernel
/
setup.c
diff --git
a/arch/cris/kernel/setup.c
b/arch/cris/kernel/setup.c
index
6d941fb
..
7af3d5d
100644
(file)
--- a/
arch/cris/kernel/setup.c
+++ b/
arch/cris/kernel/setup.c
@@
-15,7
+15,7
@@
#include <linux/bootmem.h>
#include <asm/pgtable.h>
#include <linux/seq_file.h>
-#include <linux/
tty
.h>
+#include <linux/
screen_info
.h>
#include <linux/utsname.h>
#include <linux/pfn.h>