diff --git a/[refs] b/[refs] index 5c51b5b05dbe..06d9d32d2745 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 387f96b4d9391bf3ce6928fb9cd90c9c7df37291 +refs/heads/master: f7757a5f0fa94a0ce4d6ea55f440845bb3faf712 diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c index 9b5a10ac3e25..9f91f1a20542 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_os.c +++ b/trunk/drivers/scsi/qla2xxx/qla_os.c @@ -1283,9 +1283,6 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info) fc_port_t *fcport; struct scsi_host_template *sht; -if (PCI_FUNC(pdev->devfn)) - goto probe_out; - if (pci_enable_device(pdev)) goto probe_out;