--- linux/drivers/pnp/isapnp.c.old	Fri Aug 20 16:39:46 1999
+++ linux/drivers/pnp/isapnp.c	Fri Aug 20 21:49:24 1999
@@ -1882,7 +1882,7 @@
 		return -EINVAL;
       	isapnp_cfg_begin(dev->bus->number, dev->devfn);
 	isapnp_deactivate(dev->devfn);
-	dev->activate = 0;
+	dev->active = 0;
 	isapnp_cfg_end();
 	return 0;
 }
@@ -1971,7 +1971,7 @@
 	struct pci_dev *next;
 
 	while (dev) {
-		next = dev->next;
+		next = dev->sibling;
 		isapnp_free_resources((struct isapnp_resources *)dev->sysdata, 0);
 		kfree(dev);
 		dev = next;