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
/
ppc
/
kernel
/
setup.c
diff --git
a/arch/ppc/kernel/setup.c
b/arch/ppc/kernel/setup.c
index
1f79e84
..
a74f46d
100644
(file)
--- a/
arch/ppc/kernel/setup.c
+++ b/
arch/ppc/kernel/setup.c
@@
-2,7
+2,6
@@
* Common prep boot and setup code.
*/
* Common prep boot and setup code.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/sched.h>
@@
-12,7
+11,7
@@
#include <linux/delay.h>
#include <linux/initrd.h>
#include <linux/ide.h>
#include <linux/delay.h>
#include <linux/initrd.h>
#include <linux/ide.h>
-#include <linux/
tty
.h>
+#include <linux/
screen_info
.h>
#include <linux/bootmem.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
#include <linux/bootmem.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
@@
-475,7
+474,7
@@
int __init ppc_init(void)
/* register CPU devices */
for_each_possible_cpu(i)
/* register CPU devices */
for_each_possible_cpu(i)
- register_cpu(&cpu_devices[i], i
, NULL
);
+ register_cpu(&cpu_devices[i], i);
/* call platform init */
if (ppc_md.init != NULL) {
/* call platform init */
if (ppc_md.init != NULL) {