diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 05:16:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 05:16:24 -0700 |
| commit | 4706df3d3c42af802597d82c8b1542c3d52eab23 (patch) | |
| tree | 4c11ca2a72158cacce93ef6d2976af3a11ed314f /arch/ppc64/kernel/pmac_setup.c | |
| parent | 5bcaa155797ab62ed363932ec0f02fbcb5db1ef1 (diff) | |
| parent | cebb2b156319990fc2fba615bbfeac81be62a86a (diff) | |
| download | linux-4706df3d3c42af802597d82c8b1542c3d52eab23.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/kernel/pmac_setup.c')
| -rw-r--r-- | arch/ppc64/kernel/pmac_setup.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c index 8ff86a766cdf7..e7f695dcd8c8d 100644 --- a/arch/ppc64/kernel/pmac_setup.c +++ b/arch/ppc64/kernel/pmac_setup.c @@ -274,16 +274,6 @@ static void __pmac pmac_halt(void) } #ifdef CONFIG_BOOTX_TEXT -static int dummy_getc_poll(void) -{ - return -1; -} - -static unsigned char dummy_getc(void) -{ - return 0; -} - static void btext_putc(unsigned char c) { btext_drawchar(c); @@ -342,16 +332,13 @@ static void __init pmac_init_early(void) sccdbg = 1; udbg_init_scc(NULL); } - - else { #ifdef CONFIG_BOOTX_TEXT + else { init_boot_display(); - ppc_md.udbg_putc = btext_putc; - ppc_md.udbg_getc = dummy_getc; - ppc_md.udbg_getc_poll = dummy_getc_poll; -#endif /* CONFIG_BOOTX_TEXT */ + udbg_putc = btext_putc; } +#endif /* CONFIG_BOOTX_TEXT */ /* Setup interrupt mapping options */ ppc64_interrupt_controller = IC_OPEN_PIC; |