diff -ur -X /usr/dontdiff /linux.vanilla/drivers/char/i810-tco.c /linux/drivers/char/i810-tco.c
--- /linux.vanilla/drivers/char/i810-tco.c	Mon Jun 25 23:45:39 2001
+++ /linux/drivers/char/i810-tco.c	Tue Jun 26 00:19:14 2001
@@ -261,12 +261,11 @@
 	 */
 
 	pci_for_each_dev(dev) {
-		i810tco_pci = pci_match_device(i810tco_pci_tbl, dev);
-		if (i810tco_pci != NULL)
+		if (pci_match_device(i810tco_pci_tbl, dev))
 			break;
 	}
 
-	if (i810tco_pci) {
+	if ((i810tco_pci = dev)) {
 		/*
 		 *      Find the ACPI base I/O address which is the base
 		 *      for the TCO registers (TCOBASE=ACPIBASE + 0x60)