git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
cris
/
kernel
/
setup.c
diff --git
a/arch/cris/kernel/setup.c
b/arch/cris/kernel/setup.c
index
619a6ee
..
7af3d5d
100644
(file)
--- a/
arch/cris/kernel/setup.c
+++ b/
arch/cris/kernel/setup.c
@@
-10,13
+10,12
@@
* This file handles the architecture-dependent parts of initialization
*/
* This file handles the architecture-dependent parts of initialization
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/bootmem.h>
#include <asm/pgtable.h>
#include <linux/seq_file.h>
#include <linux/init.h>
#include <linux/mm.h>
#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>
#include <linux/utsname.h>
#include <linux/pfn.h>