diff --git a/[refs] b/[refs]
index 6c39c423989b..ca2a6ba696bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21309dabd3eec2827c7604a0cba19f3e795c33d7
+refs/heads/master: 3dd5ca831317a752095040d403e80cf7a6a783b5
diff --git a/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c b/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
index adcc002bba6b..4f829b666fe5 100644
--- a/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -495,7 +495,7 @@ static int __devinit hpdi_auto_attach(struct comedi_device *dev,
 		return -ENOMEM;
 	dev->private = devpriv;
 
-	if (comedi_pci_enable(pcidev, dev->driver->driver_name)) {
+	if (comedi_pci_enable(pcidev, dev->board_name)) {
 		dev_warn(dev->class_dev,
 			 "failed enable PCI device and request regions\n");
 		return -EIO;
@@ -521,7 +521,7 @@ static int __devinit hpdi_auto_attach(struct comedi_device *dev,
 
 	/*  get irq */
 	if (request_irq(pcidev->irq, handle_interrupt, IRQF_SHARED,
-			dev->driver->driver_name, dev)) {
+			dev->board_name, dev)) {
 		dev_warn(dev->class_dev,
 			 "unable to allocate irq %u\n", pcidev->irq);
 		return -EINVAL;