diff options
| -rw-r--r-- | arch/powerpc/Kconfig.debug | 5 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup_32.c | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index 9254806f7032..8d48e9e7162a 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug | |||
| @@ -110,11 +110,6 @@ config SERIAL_TEXT_DEBUG | |||
| 110 | depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \ | 110 | depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \ |
| 111 | PPC_GEN550 || PPC_MPC52xx | 111 | PPC_GEN550 || PPC_MPC52xx |
| 112 | 112 | ||
| 113 | config PPC_OCP | ||
| 114 | bool | ||
| 115 | depends on IBM_OCP || XILINX_OCP | ||
| 116 | default y | ||
| 117 | |||
| 118 | choice | 113 | choice |
| 119 | prompt "Early debugging (dangerous)" | 114 | prompt "Early debugging (dangerous)" |
| 120 | bool | 115 | bool |
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 |
