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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
sh64
/
kernel
/
setup.c
diff --git
a/arch/sh64/kernel/setup.c
b/arch/sh64/kernel/setup.c
index
ffb310e
..
c7a7b81
100644
(file)
--- a/
arch/sh64/kernel/setup.c
+++ b/
arch/sh64/kernel/setup.c
@@
-36,9
+36,10
@@
#include <linux/slab.h>
#include <linux/user.h>
#include <linux/a.out.h>
#include <linux/slab.h>
#include <linux/user.h>
#include <linux/a.out.h>
-#include <linux/
screen_info
.h>
+#include <linux/
tty
.h>
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/delay.h>
+#include <linux/config.h>
#include <linux/init.h>
#include <linux/seq_file.h>
#include <linux/blkdev.h>
#include <linux/init.h>
#include <linux/seq_file.h>
#include <linux/blkdev.h>
@@
-47,7
+48,6
@@
#include <linux/root_dev.h>
#include <linux/cpu.h>
#include <linux/initrd.h>
#include <linux/root_dev.h>
#include <linux/cpu.h>
#include <linux/initrd.h>
-#include <linux/pfn.h>
#include <asm/processor.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
#include <asm/page.h>
#include <asm/pgtable.h>
@@
-308,7
+308,7
@@
static struct cpu cpu[1];
static int __init topology_init(void)
{
static int __init topology_init(void)
{
- return register_cpu(cpu, 0);
+ return register_cpu(cpu, 0
, NULL
);
}
subsys_initcall(topology_init);
}
subsys_initcall(topology_init);