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

• Lines: 27
• Date: Wed Dec 6 12:06:18 2000
• Orig file: v2.4.0-test11/linux/drivers/char/serial.c
• Orig date: Tue Oct 31 12:42:26 2000

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/char/serial.c linux/drivers/char/serial.c
@@ -673,7 +673,7 @@
 #if (LINUX_VERSION_CODE > 131394) /* 2.1.66 */
 	tty_flip_buffer_push(tty);
 #else
-	queue_task_irq_off(&tty->flip.tqueue, &tq_timer);
+	queue_task(&tty->flip.tqueue, &tq_timer);
 #endif	
 }
 
@@ -3990,7 +3990,7 @@
 	if (dev->vendor == PCI_VENDOR_ID_PANACOM)
 		irq_config = 0x43;
 	if ((dev->vendor == PCI_VENDOR_ID_PLX) &&
-	    (dev->device == PCI_VENDOR_ID_PLX_ROMULUS)) {
+	    (dev->device == PCI_DEVICE_ID_PLX_ROMULUS)) {
 		/*
 		 * As the megawolf cards have the int pins active
 		 * high, and have 2 UART chips, both ints must be
@@ -4324,7 +4324,7 @@
 		SPCI_FL_BASE2, 8, 460800 },
 	/* Megawolf Romulus PCI Serial Card, from Mike Hudson */
 	/* (Exoray@isys.ca) */
-	{	PCI_VENDOR_ID_PLX, PCI_VENDOR_ID_PLX_ROMULUS,
+	{	PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_ROMULUS,
 		0x10b5, 0x106a,
 		SPCI_FL_BASE2, 4, 921600,
 		0x20, 2, pci_plx9050_fn, 0x03 },