Browse Source

firmware,IB/qib: revert firmware file move

Commit e2eed58b4f ("IB/qib: change QLogic to Intel") moved a firmware
file potentially breaking the ABI.

This patch reverts that aspect of the fix as well as reverting the
firmware name as used in qib.

Reported-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
imx_3.10.17_1.0.0_ga
Mike Marciniszyn 8 years ago
committed by Linus Torvalds
parent
commit
ff802e31b5
3 changed files with 2 additions and 2 deletions
  1. +1
    -1
      drivers/infiniband/hw/qib/qib_sd7220.c
  2. +1
    -1
      firmware/Makefile
  3. +0
    -0
      firmware/qlogic/sd7220.fw.ihex

+ 1
- 1
drivers/infiniband/hw/qib/qib_sd7220.c View File

@ -44,7 +44,7 @@
#include "qib.h"
#include "qib_7220.h"
#define SD7220_FW_NAME "intel/sd7220.fw"
#define SD7220_FW_NAME "qlogic/sd7220.fw"
MODULE_FIRMWARE(SD7220_FW_NAME);
/*


+ 1
- 1
firmware/Makefile View File

@ -82,7 +82,7 @@ fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
fw-shipped-$(CONFIG_SCSI_QLOGIC_1280) += qlogic/1040.bin qlogic/1280.bin \
qlogic/12160.bin
fw-shipped-$(CONFIG_SCSI_QLOGICPTI) += qlogic/isp1000.bin
fw-shipped-$(CONFIG_INFINIBAND_QIB) += intel/sd7220.fw
fw-shipped-$(CONFIG_INFINIBAND_QIB) += qlogic/sd7220.fw
fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp
fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \
ess/maestro3_assp_minisrc.fw


firmware/intel/sd7220.fw.ihex → firmware/qlogic/sd7220.fw.ihex View File


Loading…
Cancel
Save