diff --git a/[refs] b/[refs]
index be7f27316941..56006e07fb31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12a2dd66a259f2ae6bd26243f711383d710872b9
+refs/heads/master: c1a54962537afe40351f390bbb0197c49f858b6d
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci7296.c b/trunk/drivers/staging/comedi/drivers/adl_pci7296.c
index 1b9ea543a822..67233be8c7d6 100644
--- a/trunk/drivers/staging/comedi/drivers/adl_pci7296.c
+++ b/trunk/drivers/staging/comedi/drivers/adl_pci7296.c
@@ -133,15 +133,6 @@ static int adl_pci7296_attach_pci(struct comedi_device *dev,
 	return 0;
 }
 
-static int adl_pci7296_attach(struct comedi_device *dev,
-			      struct comedi_devconfig *it)
-{
-	dev_warn(dev->class_dev,
-		"This driver does not support attach using comedi_config\n");
-
-	return -ENOSYS;
-}
-
 static void adl_pci7296_detach(struct comedi_device *dev)
 {
 	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -164,7 +155,6 @@ static void adl_pci7296_detach(struct comedi_device *dev)
 static struct comedi_driver adl_pci7296_driver = {
 	.driver_name	= "adl_pci7296",
 	.module		= THIS_MODULE,
-	.attach		= adl_pci7296_attach,
 	.attach_pci	= adl_pci7296_attach_pci,
 	.detach		= adl_pci7296_detach,
 };