diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-29 11:21:59 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-09 14:50:58 +1100 |
| commit | 8dacaedf04467e32c50148751a96150e73323cdc (patch) | |
| tree | 74e8406ee6a78c7cf232858994ee49547c273042 /arch/powerpc/platforms/chrp | |
| parent | 1c3eb629102bd4e327cc8b08fb9cdae4a985e841 (diff) | |
| download | kernel-crypto-8dacaedf04467e32c50148751a96150e73323cdc.tar.gz kernel-crypto-8dacaedf04467e32c50148751a96150e73323cdc.tar.xz kernel-crypto-8dacaedf04467e32c50148751a96150e73323cdc.zip | |
[PATCH] powerpc: More serial probe fixes (#2)
This fixes the new serial probe code with some PCI MMIO UARTs, and fixes
CHRP build with ARCH=powerpc.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/chrp')
| -rw-r--r-- | arch/powerpc/platforms/chrp/setup.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c index dda5f2c72c2..4ec8ba737e7 100644 --- a/arch/powerpc/platforms/chrp/setup.c +++ b/arch/powerpc/platforms/chrp/setup.c @@ -49,7 +49,6 @@ #include <asm/hydra.h> #include <asm/sections.h> #include <asm/time.h> -#include <asm/btext.h> #include <asm/i8259.h> #include <asm/mpic.h> #include <asm/rtas.h> @@ -58,7 +57,6 @@ #include "chrp.h" void rtas_indicator_progress(char *, unsigned short); -void btext_progress(char *, unsigned short); int _chrp_type; EXPORT_SYMBOL(_chrp_type); @@ -264,11 +262,6 @@ void __init chrp_setup_arch(void) ppc_md.set_rtc_time = rtas_set_rtc_time; } -#ifdef CONFIG_BOOTX_TEXT - if (ppc_md.progress == NULL && boot_text_mapped) - ppc_md.progress = btext_progress; -#endif - #ifdef CONFIG_BLK_DEV_INITRD /* this is fine for chrp */ initrd_below_start_ok = 1; @@ -522,12 +515,3 @@ void __init chrp_init(void) smp_ops = &chrp_smp_ops; #endif /* CONFIG_SMP */ } - -#ifdef CONFIG_BOOTX_TEXT -void -btext_progress(char *s, unsigned short hex) -{ - btext_drawstring(s); - btext_drawstring("\n"); -} -#endif /* CONFIG_BOOTX_TEXT */ |