From 8374dc6c2998c96280f8699befae0ca00004481a Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 16 Aug 2012 19:55:19 -0700
Subject: [PATCH] --- yaml --- r: 324601 b: refs/heads/master c:
 c3b52d465916acd02803e83e58d9440ec365ab72 h: refs/heads/master i:   324599:
 d0450005c5ea6896f01bfb55110bd8a3ee1b4e99 v: v3

---
 [refs]                                              |  2 +-
 trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 2dad9907bb32..fbdf18e77762 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22f2f541d06a874d8a5b228fca0186e333a1e351
+refs/heads/master: c3b52d465916acd02803e83e58d9440ec365ab72
diff --git a/trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c b/trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c
index e852808c6314..9d55aa912567 100644
--- a/trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -253,15 +253,6 @@ static int dyna_pci10xx_attach_pci(struct comedi_device *dev,
 	return 0;
 }
 
-static int dyna_pci10xx_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 dyna_pci10xx_detach(struct comedi_device *dev)
 {
 	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -278,7 +269,6 @@ static void dyna_pci10xx_detach(struct comedi_device *dev)
 static struct comedi_driver dyna_pci10xx_driver = {
 	.driver_name	= "dyna_pci10xx",
 	.module		= THIS_MODULE,
-	.attach		= dyna_pci10xx_attach,
 	.attach_pci	= dyna_pci10xx_attach_pci,
 	.detach		= dyna_pci10xx_detach,
 };