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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
ppc
/
kernel
/
setup.c
diff --git
a/arch/ppc/kernel/setup.c
b/arch/ppc/kernel/setup.c
index
7cd9e21
..
18a2f14
100644
(file)
--- a/
arch/ppc/kernel/setup.c
+++ b/
arch/ppc/kernel/setup.c
@@
-37,6
+37,7
@@
#include <asm/sections.h>
#include <asm/nvram.h>
#include <asm/xmon.h>
#include <asm/sections.h>
#include <asm/nvram.h>
#include <asm/xmon.h>
+#include <asm/ocp.h>
#if defined CONFIG_KGDB
#include <asm/kgdb.h>
#if defined CONFIG_KGDB
#include <asm/kgdb.h>
@@
-683,6
+684,12
@@
void __init setup_arch(char **cmdline_p)
do_init_bootmem();
if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab);
do_init_bootmem();
if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab);
+#ifdef CONFIG_PPC_OCP
+ /* Initialize OCP device list */
+ ocp_early_init();
+ if ( ppc_md.progress ) ppc_md.progress("ocp: exit", 0x3eab);
+#endif
+
ppc_md.setup_arch();
if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab);
ppc_md.setup_arch();
if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab);