diff --git a/[refs] b/[refs]
index e584d72fa9a1..8af6f2b4b650 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 847d74a26010e9bae51299b7c1008c5ec9a349f4
+refs/heads/master: a692e9743a7b2085afbca2f7e50a449c3e205cc0
diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c
index d8c3cd32f452..f780d38d6da0 100644
--- a/trunk/drivers/staging/comedi/drivers.c
+++ b/trunk/drivers/staging/comedi/drivers.c
@@ -947,26 +947,10 @@ void comedi_pci_disable(struct pci_dev *pdev)
 }
 EXPORT_SYMBOL_GPL(comedi_pci_disable);
 
-static int comedi_pci_attach_wrapper(struct comedi_device *dev,
-				     unsigned long context)
-{
-	return dev->driver->attach_pci(dev, (struct pci_dev *)context);
-}
-
-static int comedi_new_pci_auto_config(struct pci_dev *pcidev,
-				      struct comedi_driver *driver)
-{
-	return comedi_auto_config_helper(&pcidev->dev, driver,
-					 comedi_pci_attach_wrapper,
-					 (unsigned long)pcidev);
-}
-
 int comedi_pci_auto_config(struct pci_dev *pcidev, struct comedi_driver *driver)
 {
 
-	if (driver->attach_pci)
-		return comedi_new_pci_auto_config(pcidev, driver);
-	else if (driver->auto_attach)
+	if (driver->auto_attach)
 		return comedi_auto_config(&pcidev->dev, driver, 0);
 	else
 		return -EINVAL;