lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc

Browse Source
This commit is contained in:
Paul Mackerras
2006-03-28 17:03:19 +11:00
parent facee873de 78af90629c
commit cf66c897d7
59 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/kernel/setup_32.c
View File

@@ -351,12 +351,6 @@ void __init setup_arch(char **cmdline_p)
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
#ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con;
#endif