diff --git a/[refs] b/[refs]
index a7c8ab10abad..d61e8633ebcb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f34e08f54f078cb4911962b43c2bd16c2f8ccce3
+refs/heads/master: 8e17cfbaa0b6ffa839028661327a17020cc53d2d
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
index 06550c999bac..2c39dc5f8d5f 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -1259,8 +1259,6 @@ static int dio200_pci_common_attach(struct comedi_device *dev,
 	unsigned long iobase;
 	int ret;
 
-	comedi_set_hw_dev(dev, &pci_dev->dev);
-
 	ret = comedi_pci_enable(pci_dev, DIO200_DRIVER_NAME);
 	if (ret < 0) {
 		dev_err(dev->class_dev,