diff --git a/[refs] b/[refs]
index 352b09278c51..aacba1753f8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95a84cd19224e7d41934d261b568dd04bf2bda3e
+refs/heads/master: 283435621a21679e02088b5abcce7d15d6d2010a
diff --git a/trunk/drivers/ide/sgiioc4.c b/trunk/drivers/ide/sgiioc4.c
index d0cd670f4545..7defa0ae2014 100644
--- a/trunk/drivers/ide/sgiioc4.c
+++ b/trunk/drivers/ide/sgiioc4.c
@@ -572,7 +572,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
 
 	/*  Get the CmdBlk and CtrlBlk Base Registers */
 	bar0 = pci_resource_start(dev, 0);
-	virt_base = ioremap(bar0, pci_resource_len(dev, 0));
+	virt_base = pci_ioremap_bar(dev, 0);
 	if (virt_base == NULL) {
 		printk(KERN_ERR "%s: Unable to remap BAR 0 address: 0x%lx\n",
 				DRV_NAME, bar0);