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
/
m32r
/
kernel
/
setup.c
diff --git
a/arch/m32r/kernel/setup.c
b/arch/m32r/kernel/setup.c
index
3cd3c29
..
3f35ab3
100644
(file)
--- a/
arch/m32r/kernel/setup.c
+++ b/
arch/m32r/kernel/setup.c
@@
-7,7
+7,6
@@
* Hitoshi Yamamoto
*/
* Hitoshi Yamamoto
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/stddef.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/stddef.h>
@@
-22,7
+21,7
@@
#include <linux/root_dev.h>
#include <linux/seq_file.h>
#include <linux/timex.h>
#include <linux/root_dev.h>
#include <linux/seq_file.h>
#include <linux/timex.h>
-#include <linux/
tty
.h>
+#include <linux/
screen_info
.h>
#include <linux/cpu.h>
#include <linux/nodemask.h>
#include <linux/pfn.h>
#include <linux/cpu.h>
#include <linux/nodemask.h>
#include <linux/pfn.h>
@@
-275,7
+274,7
@@
static int __init topology_init(void)
int i;
for_each_present_cpu(i)
int i;
for_each_present_cpu(i)
- register_cpu(&cpu_devices[i], i
, NULL
);
+ register_cpu(&cpu_devices[i], i);
return 0;
}
return 0;
}