diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-05 22:06:09 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-05 22:06:25 (GMT) |
| commit | 61cfd8736040dd2d620278fb11c6c4acfeb041c9 (patch) | |
| tree | a3191d768acd36a5aff52eabe0892860dfd96730 /drivers/scsi | |
| parent | 7960ba89ca518ec99d2a937907f445a26b2a1628 (diff) | |
| parent | 7dc0f27ea43151889ae762d321e4068dd90cd9e2 (diff) | |
| download | linux-fsl-qoriq-61cfd8736040dd2d620278fb11c6c4acfeb041c9.tar.xz | |
Merge tag 'omap-for-v3.9/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
From Tony Lindgren:
Minimal updates to OMAP board-*.c files while converting
things to device tree based booting.
* tag 'omap-for-v3.9/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc
RX-51: Register twl4030-madc device
RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
ARM: OMAP1: nokia770: enable CBUS/Retu
ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator
ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
ARM: OMAP2+: craneboard: support the TPS65910 PMU
ARM: OMAP2+: craneboard: support NAND device
ARM: OMAP3: cm-t3517: add MMC support
ARM: OMAP2+: Remove apollon board support
+ Linux 3.8-rc6
Signed-off-by: Olof Johansson <olof@lixom.net>
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 d73fdcf..2839baa 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) return -ENOMEM; pci_set_drvdata(pdev, pci_info); - if (efi_enabled) + if (efi_enabled(EFI_RUNTIME_SERVICES)) orom = isci_get_efi_var(pdev); if (!orom) |