tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

firmware,IB/qib: revert firmware file move

Commit e2eed58b4fbf ("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>

authored by

Mike Marciniszyn and committed by
Linus Torvalds ff802e31 e0a77f26

+2 -2
+1 -1
drivers/infiniband/hw/qib/qib_sd7220.c
··· 44 44 #include "qib.h" 45 45 #include "qib_7220.h" 46 46 47 - #define SD7220_FW_NAME "intel/sd7220.fw" 47 + #define SD7220_FW_NAME "qlogic/sd7220.fw" 48 48 MODULE_FIRMWARE(SD7220_FW_NAME); 49 49 50 50 /*
+1 -1
firmware/Makefile
··· 82 82 fw-shipped-$(CONFIG_SCSI_QLOGIC_1280) += qlogic/1040.bin qlogic/1280.bin \ 83 83 qlogic/12160.bin 84 84 fw-shipped-$(CONFIG_SCSI_QLOGICPTI) += qlogic/isp1000.bin 85 - fw-shipped-$(CONFIG_INFINIBAND_QIB) += intel/sd7220.fw 85 + fw-shipped-$(CONFIG_INFINIBAND_QIB) += qlogic/sd7220.fw 86 86 fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp 87 87 fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \ 88 88 ess/maestro3_assp_minisrc.fw
firmware/intel/sd7220.fw.ihex firmware/qlogic/sd7220.fw.ihex