diff --git a/[refs] b/[refs]
index cf619578e021..be7f27316941 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 424d56ec3ca0ea5a4cc4caad885d8e49a3cfafc8
+refs/heads/master: 12a2dd66a259f2ae6bd26243f711383d710872b9
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci6208.c b/trunk/drivers/staging/comedi/drivers/adl_pci6208.c
index 3abff556b846..99fbd9485181 100644
--- a/trunk/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/trunk/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -248,15 +248,6 @@ static int pci6208_attach_pci(struct comedi_device *dev,
 	return 0;
 }
 
-static int pci6208_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 pci6208_detach(struct comedi_device *dev)
 {
 	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -270,7 +261,6 @@ static void pci6208_detach(struct comedi_device *dev)
 static struct comedi_driver adl_pci6208_driver = {
 	.driver_name	= "adl_pci6208",
 	.module		= THIS_MODULE,
-	.attach		= pci6208_attach,
 	.attach_pci	= pci6208_attach_pci,
 	.detach		= pci6208_detach,
 };