diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-02-01 05:17:02 -0500 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2013-02-01 05:17:02 -0500 |
| commit | d954896edb658cf72dd069d92b5235c06521ffab (patch) | |
| tree | fe8b798176191c681c6b2fa1c81aa55dc98568dc /drivers/scsi | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| parent | 12ad10004645d38356b14d1fbba379c523a61916 (diff) | |
Merge branch 'timers/for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-rmk/broadcast
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/isci/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index d73fdcfeb45a..2839baa82a5a 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c | |||
| @@ -633,7 +633,7 @@ static int isci_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 633 | return -ENOMEM; | 633 | return -ENOMEM; |
| 634 | pci_set_drvdata(pdev, pci_info); | 634 | pci_set_drvdata(pdev, pci_info); |
| 635 | 635 | ||
| 636 | if (efi_enabled) | 636 | if (efi_enabled(EFI_RUNTIME_SERVICES)) |
| 637 | orom = isci_get_efi_var(pdev); | 637 | orom = isci_get_efi_var(pdev); |
| 638 | 638 | ||
| 639 | if (!orom) | 639 | if (!orom) |