diff --git a/[refs] b/[refs]
index a4e4cbc0e31c..0b2136e4091f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b46d7da7f5e869a39b81c3d2193e88b1b52fc99
+refs/heads/master: c71b2e52a0fb895ad709dbe8caec3dfd2a612c04
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c b/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c
index de5c8faa91d8..7599053df807 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -4061,16 +4061,9 @@ static int auto_attach(struct comedi_device *dev,
 	devpriv->dio_counter_phys_iobase =
 		pci_resource_start(pcidev, 3);
 
-	/*  remap, won't work with 2.0 kernels but who cares */
-	devpriv->plx9080_iobase =
-		ioremap(devpriv->plx9080_phys_iobase,
-			pci_resource_len(pcidev, 0));
-	devpriv->main_iobase =
-		ioremap(devpriv->main_phys_iobase,
-			pci_resource_len(pcidev, 2));
-	devpriv->dio_counter_iobase =
-		ioremap(devpriv->dio_counter_phys_iobase,
-			pci_resource_len(pcidev, 3));
+	devpriv->plx9080_iobase = pci_ioremap_bar(pcidev, 0);
+	devpriv->main_iobase = pci_ioremap_bar(pcidev, 2);
+	devpriv->dio_counter_iobase = pci_ioremap_bar(pcidev, 3);
 
 	if (!devpriv->plx9080_iobase || !devpriv->main_iobase
 	    || !devpriv->dio_counter_iobase) {