From 35c7752ce7be2cf4690a0cde2e8345ab2841deb7 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Wed, 31 Oct 2012 11:56:23 +0000
Subject: [PATCH] --- yaml --- r: 337486 b: refs/heads/master c:
 5df395404b43cfd111c36822b2e691619a408024 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/comedi/drivers/rtd520.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3952b02b83bd..c40c62ceb107 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01e14a4c586ffc6e1c7b748eb8354806ccfec813
+refs/heads/master: 5df395404b43cfd111c36822b2e691619a408024
diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.c b/trunk/drivers/staging/comedi/drivers/rtd520.c
index e42bd6b1153c..23b76d0b1a56 100644
--- a/trunk/drivers/staging/comedi/drivers/rtd520.c
+++ b/trunk/drivers/staging/comedi/drivers/rtd520.c
@@ -1284,8 +1284,10 @@ static const void *rtd_find_boardinfo(struct comedi_device *dev,
 	return NULL;
 }
 
-static int rtd_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
+static int __devinit rtd_auto_attach(struct comedi_device *dev,
+				     unsigned long context_unused)
 {
+	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
 	const struct rtdBoard *thisboard;
 	struct rtdPrivate *devpriv;
 	struct comedi_subdevice *s;
@@ -1420,7 +1422,7 @@ static void rtd_detach(struct comedi_device *dev)
 static struct comedi_driver rtd520_driver = {
 	.driver_name	= "rtd520",
 	.module		= THIS_MODULE,
-	.attach_pci	= rtd_attach_pci,
+	.auto_attach	= rtd_auto_attach,
 	.detach		= rtd_detach,
 };