diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 01:03:19 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 01:03:19 -0500 |
| commit | cf66c897d7fa07f57452b1a369aec37d97b11e31 (patch) | |
| tree | eb74b71c2ff288f4d77423bb7e54c3c55ef08bf9 /arch/powerpc/kernel | |
| parent | facee873de8da5fe709c194f98eb0f2cc642a38c (diff) | |
| parent | 78af90629ce98c8383ea16928e110eb97b889be6 (diff) | |
Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/setup_32.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index e39f830317a8..a2c89435abec 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
| @@ -351,12 +351,6 @@ void __init setup_arch(char **cmdline_p) | |||
| 351 | do_init_bootmem(); | 351 | do_init_bootmem(); |
| 352 | if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab); | 352 | if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab); |
| 353 | 353 | ||
| 354 | #ifdef CONFIG_PPC_OCP | ||
| 355 | /* Initialize OCP device list */ | ||
| 356 | ocp_early_init(); | ||
| 357 | if ( ppc_md.progress ) ppc_md.progress("ocp: exit", 0x3eab); | ||
| 358 | #endif | ||
| 359 | |||
| 360 | #ifdef CONFIG_DUMMY_CONSOLE | 354 | #ifdef CONFIG_DUMMY_CONSOLE |
| 361 | conswitchp = &dummy_con; | 355 | conswitchp = &dummy_con; |
| 362 | #endif | 356 | #endif |