diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /arch/ppc/kernel/prep_setup.c | |
parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'arch/ppc/kernel/prep_setup.c')
-rw-r--r-- | arch/ppc/kernel/prep_setup.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/ppc/kernel/prep_setup.c b/arch/ppc/kernel/prep_setup.c index 0c23c51ac..772cceb61 100644 --- a/arch/ppc/kernel/prep_setup.c +++ b/arch/ppc/kernel/prep_setup.c @@ -215,7 +215,6 @@ no_l2: void __init prep_setup_arch(void) { - extern char cmd_line[]; unsigned char reg; #if 0 /* unused?? */ unsigned char ucMothMemType; @@ -272,8 +271,6 @@ prep_setup_arch(void) } } - printk("Boot arguments: %s\n", cmd_line); - #ifdef CONFIG_SOUND_CS4232 /* * setup proper values for the cs4232 driver so we don't have |