X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fm32r%2Fkernel%2Fsetup.c;fp=arch%2Fm32r%2Fkernel%2Fsetup.c;h=542ed9342189a65d0ca895db83d368a1d825586a;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=3f35ab3d2dc28060b6030c76b37726887e8edd5f;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c
index 3f35ab3d2..542ed9342 100644
--- a/arch/m32r/kernel/setup.c
+++ b/arch/m32r/kernel/setup.c
@@ -7,6 +7,7 @@
  *                            Hitoshi Yamamoto
  */
 
+#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/stddef.h>
@@ -21,10 +22,9 @@
 #include <linux/root_dev.h>
 #include <linux/seq_file.h>
 #include <linux/timex.h>
-#include <linux/screen_info.h>
+#include <linux/tty.h>
 #include <linux/cpu.h>
 #include <linux/nodemask.h>
-#include <linux/pfn.h>
 
 #include <asm/processor.h>
 #include <asm/pgtable.h>
@@ -274,7 +274,7 @@ static int __init topology_init(void)
 	int i;
 
 	for_each_present_cpu(i)
-		register_cpu(&cpu_devices[i], i);
+		register_cpu(&cpu_devices[i], i, NULL);
 
 	return 0;
 }