patch-2.2.18 linux/drivers/misc/parport_pc.c

• Lines: 42
• Date: Mon Oct 2 10:09:14 2000
• Orig file: v2.2.17/drivers/misc/parport_pc.c
• Orig date: Sun Jun 11 21:44:14 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/misc/parport_pc.c linux/drivers/misc/parport_pc.c
@@ -617,7 +617,7 @@
 
 	sti();
 	irqs = probe_irq_on();
-		
+
 	parport_pc_write_econtrol(pb, 0x00);	/* Reset FIFO */
 	parport_pc_write_econtrol(pb, 0xd0);	/* TEST FIFO + nErrIntrEn */
 
@@ -902,11 +902,13 @@
 		  { { 0, -1 }, } },
 		{ PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_DUAL_PAR_B, 1,
 		  { { 0, -1 }, } },
+		{ PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_BOCA_IOPPAR, 1,
+		  { { 0, -1 }, } },
 		{ PCI_VENDOR_ID_AFAVLAB, PCI_DEVICE_ID_AFAVLAB_TK9902, 1,
 		  { { 0, 1 }, } },
-		{ PCI_VENDOR_ID_TIMEDIA, PCI_DEVICE_ID_TIMEDIA_1889, 1,
-		  { { 2, -1 }, } },
-		{ PCI_VENDOR_ID_TIMEDIA, PCI_DEVICE_ID_TIMEDIA_4008A, 1,
+		{ PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954PP, 1,
+		  { { 0, -1 }, } },
+		{ PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_12PCI840, 1,
 		  { { 0, 1 }, } },
 		{ 0, }
 	};
@@ -946,6 +948,7 @@
 		}
 	}
 
+#ifdef CONFIG_PCI
 	/* Look for parallel controllers that we don't know about. */
 	for (pcidev = pci_devices; pcidev; pcidev = pcidev->next) {
 		const int class_noprogif = pcidev->class & ~0xff;
@@ -966,6 +969,7 @@
 			"tim@cyberelk.demon.co.uk\n",
 			pcidev->vendor, pcidev->device);
 	}
+#endif
 
 	return count;
 }