patch-2.4.0-test8 linux/drivers/char/serial.c

• Lines: 23
• Date: Thu Sep 7 08:40:58 2000
• Orig file: v2.4.0-test7/linux/drivers/char/serial.c
• Orig date: Wed Aug 23 18:36:37 2000

diff -u --recursive --new-file v2.4.0-test7/linux/drivers/char/serial.c linux/drivers/char/serial.c
@@ -4560,6 +4560,9 @@
 	{	PCI_VENDOR_ID_ROCKWELL, 0x1004,
 		0x1048, 0x1500, 
 		SPCI_FL_BASE1, 1, 115200 },
+	{	PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3,
+		0xFF00, 0, SPCI_FL_BASE0 | SPCI_FL_IRQRESOURCE,
+		1, 458333, 0, 0, 0, 0x20178 },
 #if CONFIG_DDB5074
 	/*
 	 * NEC Vrc-5074 (Nile 4) builtin UART.
@@ -5280,12 +5283,6 @@
 		if ((rs_table[i].port == port) &&
 		    (rs_table[i].iomem_base == req->iomem_base))
 			break;
-	}
-	if (i == NR_PORTS) {
-		for (i = 4; i < NR_PORTS; i++)
-			if ((rs_table[i].type == PORT_UNKNOWN) &&
-			    (rs_table[i].count == 0))
-				break;
 	}
 	if (i == NR_PORTS) {
 		for (i = 0; i < NR_PORTS; i++)