patch-2.3.35 linux/arch/ppc/kernel/chrp_setup.c

• Lines: 31
• Date: Mon Dec 27 14:10:20 1999
• Orig file: v2.3.34/linux/arch/ppc/kernel/chrp_setup.c
• Orig date: Thu Nov 11 20:11:32 1999

diff -u --recursive --new-file v2.3.34/linux/arch/ppc/kernel/chrp_setup.c linux/arch/ppc/kernel/chrp_setup.c
@@ -249,7 +249,7 @@
 	else
 #endif
 		ROOT_DEV = to_kdev_t(0x0802); /* sda2 (sda1 is for the kernel) */
-	
+sprintf(cmd_line, "console=ttyS0,9600 console=tty0");
 	printk("Boot arguments: %s\n", cmd_line);
 	
 	request_region(0x20,0x20,"pic1");
@@ -391,7 +391,7 @@
 	 * openpic irq.  So we just check to make sure the controller
 	 * is an openpic and if it is then eoi
 	 *
-	 * We do it this way since our irq_desc[irq].ctl can change
+	 * We do it this way since our irq_desc[irq].handler can change
 	 * with RTL and no longer be open_pic -- Cort
 	 */
 	if ( irq >= open_pic.irq_offset)
@@ -413,10 +413,10 @@
 	}
 	open_pic.irq_offset = 16;
 	for ( i = 16 ; i < NR_IRQS ; i++ )
-		irq_desc[i].ctl = &open_pic;
+		irq_desc[i].handler = &open_pic;
 	openpic_init(1);
 	for ( i = 0 ; i < 16  ; i++ )
-		irq_desc[i].ctl = &i8259_pic;
+		irq_desc[i].handler = &i8259_pic;
 	i8259_init();
 #ifdef CONFIG_XMON
 	request_irq(openpic_to_irq(HYDRA_INT_ADB_NMI),