diff options
Diffstat (limited to 'arch/alpha/kernel')
-rw-r--r-- | arch/alpha/kernel/setup.c | 9 | ||||
-rw-r--r-- | arch/alpha/kernel/srmcons.c | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index d352c2b05f1a..915f26345c45 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c | |||
@@ -744,15 +744,6 @@ setup_arch(char **cmdline_p) | |||
744 | paging_init(); | 744 | paging_init(); |
745 | } | 745 | } |
746 | 746 | ||
747 | void __init | ||
748 | disable_early_printk(void) | ||
749 | { | ||
750 | if (alpha_using_srm && srmcons_output) { | ||
751 | unregister_srm_console(); | ||
752 | srmcons_output = 0; | ||
753 | } | ||
754 | } | ||
755 | |||
756 | static char sys_unknown[] = "Unknown"; | 747 | static char sys_unknown[] = "Unknown"; |
757 | static char systype_names[][16] = { | 748 | static char systype_names[][16] = { |
758 | "0", | 749 | "0", |
diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c index 85a821aaceb4..930cedc8be24 100644 --- a/arch/alpha/kernel/srmcons.c +++ b/arch/alpha/kernel/srmcons.c | |||
@@ -300,7 +300,7 @@ static struct console srmcons = { | |||
300 | .write = srm_console_write, | 300 | .write = srm_console_write, |
301 | .device = srm_console_device, | 301 | .device = srm_console_device, |
302 | .setup = srm_console_setup, | 302 | .setup = srm_console_setup, |
303 | .flags = CON_PRINTBUFFER, | 303 | .flags = CON_PRINTBUFFER | CON_BOOT, |
304 | .index = -1, | 304 | .index = -1, |
305 | }; | 305 | }; |
306 | 306 | ||