diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-22 15:36:52 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-22 15:36:52 +1000 |
commit | 529294d59fdc77bf15f00f2308bbeb73e03e7042 (patch) | |
tree | e04c555d8c1ed398b1543442e0f2d4d82b360acb /arch/ppc64/kernel/setup.c | |
parent | f7abbc190b0edec34627d5348ba1d5fa5577da77 (diff) |
ppc64: Rearrange btext initialization for consistency with ppc32
Moved init_boot_display from arch/ppc64/kernel/pmac_setup.c to
arch/ppc64/kernel/btext.c and declared it in asm-ppc64/btext.h.
Call it from init_early rather than pmac_init_early.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/setup.c')
-rw-r--r-- | arch/ppc64/kernel/setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c index b7885028fcf..44ee6ebe9a6 100644 --- a/arch/ppc64/kernel/setup.c +++ b/arch/ppc64/kernel/setup.c @@ -585,6 +585,10 @@ void __init setup_system(void) */ finish_device_tree(); +#ifdef CONFIG_BOOTX_TEXT + init_boot_display(); +#endif + /* * Initialize xmon */ |