=== modified file 'mpt2sas_base.c' --- mpt2sas_base.c 2010-07-30 20:50:37 +0000 +++ mpt2sas_base.c 2010-07-30 21:00:33 +0000 @@ -1177,22 +1177,21 @@ r = -ENODEV; goto out_fail; } + #else - ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM); - if (pci_enable_device_mem(pdev)) { - printk(MPT2SAS_WARN_FMT "pci_enable_device_mem: " - "failed\n", ioc->name); - return -ENODEV; - } - - - if (pci_request_selected_regions(pdev, ioc->bars, - MPT2SAS_DRIVER_NAME)) { - printk(MPT2SAS_WARN_FMT "pci_request_selected_regions: " - "failed\n", ioc->name); - r = -ENODEV; - goto out_fail; - } + if (pci_enable_device(pdev)) { + printk(MPT2SAS_WARN_FMT "pci_enable_device: failed\n", + ioc->name); + return -ENODEV; + } + + if (pci_request_regions(pdev, MPT2SAS_DRIVER_NAME)) { + printk(MPT2SAS_WARN_FMT "pci_request_regions: failed\n", + ioc->name); + r = -ENODEV; + goto out_fail; + } + #endif pci_set_master(pdev);