diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-04-01 22:08:26 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-01 22:08:26 +1100 |
| commit | f18dd516d433d0b740aa8365d706f5ad47603449 (patch) | |
| tree | 0982ab6ddb1c7c01da258dfe9b294428c8231387 /arch/powerpc/kernel/setup_32.c | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
| parent | 72d2c3e038fb4846e32cf3f6d66ebd1013329986 (diff) | |
| download | kernel_samsung_crespo-f18dd516d433d0b740aa8365d706f5ad47603449.zip kernel_samsung_crespo-f18dd516d433d0b740aa8365d706f5ad47603449.tar.gz kernel_samsung_crespo-f18dd516d433d0b740aa8365d706f5ad47603449.tar.bz2 | |
Merge branch 'for_paulus' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/powerpc/kernel/setup_32.c')
| -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 a72bf5d..69ac257 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -50,7 +50,6 @@ #include <asm/kgdb.h> #endif -extern void platform_init(void); extern void bootx_init(unsigned long r4, unsigned long phys); boot_infos_t *boot_infos; @@ -138,12 +137,7 @@ void __init machine_init(unsigned long dt_ptr, unsigned long phys) strlcpy(cmd_line, CONFIG_CMDLINE, sizeof(cmd_line)); #endif /* CONFIG_CMDLINE */ -#ifdef CONFIG_PPC_MULTIPLATFORM probe_machine(); -#else - /* Base init based on machine type. Obsoloete, please kill ! */ - platform_init(); -#endif #ifdef CONFIG_6xx if (cpu_has_feature(CPU_FTR_CAN_DOZE) || |