diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
| commit | b876d08f816527af257e13d89fb0d3b4b849223c (patch) | |
| tree | 40569f568230f918ca55f04b355e251747f913ed /drivers/scsi/qla2xxx/qla_os.c | |
| parent | b364776ad1208a71f0c53578c84619a395412a8d (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pci/dmar.c
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_os.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 2aed4721c0d0..21dd182ad512 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
| @@ -1566,9 +1566,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 1566 | goto probe_out; | 1566 | goto probe_out; |
| 1567 | } | 1567 | } |
| 1568 | 1568 | ||
| 1569 | if (pci_find_aer_capability(pdev)) | 1569 | /* This may fail but that's ok */ |
| 1570 | if (pci_enable_pcie_error_reporting(pdev)) | 1570 | pci_enable_pcie_error_reporting(pdev); |
| 1571 | goto probe_out; | ||
| 1572 | 1571 | ||
| 1573 | host = scsi_host_alloc(sht, sizeof(scsi_qla_host_t)); | 1572 | host = scsi_host_alloc(sht, sizeof(scsi_qla_host_t)); |
| 1574 | if (host == NULL) { | 1573 | if (host == NULL) { |