diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-22 04:28:21 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-22 04:28:21 +0900 |
| commit | 677d1bb0cbcfc43d10e95ab0c28b9045a1de7b5b (patch) | |
| tree | 86983da79b6620d4ef526383defed6a4c63b36e5 /drivers | |
| parent | Merge tag 'renesas-sh-drivers-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas (diff) | |
| parent | iscsi_ibft: Fix finding Broadcom specific ibft sign (diff) | |
| download | linux-dev-677d1bb0cbcfc43d10e95ab0c28b9045a1de7b5b.tar.xz linux-dev-677d1bb0cbcfc43d10e95ab0c28b9045a1de7b5b.zip | |
Merge tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft
Pull iscsi_ibft fix from Konrad Rzeszutek Wilk:
"Fix iBFT regression on Broadcom NICs introduced in 3.2"
* tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
iscsi_ibft: Fix finding Broadcom specific ibft sign
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/iscsi_ibft.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 3ee852c9925b..071c2c969eec 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c @@ -756,6 +756,7 @@ static const struct { */ { ACPI_SIG_IBFT }, { "iBFT" }, + { "BIFT" }, /* Broadcom iSCSI Offload */ }; static void __init acpi_find_ibft_region(void) |