Skip to contentSkip to conversation

firmware,IB/qib: revert firmware file move

PATCH New Mike Marciniszyn 1 participant 1 message Apr 5, 2013 InfiniBand

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 firmware,IB/qib: revert firmware file move

Commit e2eed58 ("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.

---
 drivers/infiniband/hw/qib/qib_sd7220.c |    2 +-
 firmware/Makefile                      |    2 +-
 firmware/qlogic/sd7220.fw.ihex         |    0 
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename firmware/{intel/sd7220.fw.ihex => qlogic/sd7220.fw.ihex} (100%)
drivers/infiniband/hw/qib/qib_sd7220.c +1 -1
index 08a6c6d..911205d 100644
@@ -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);
 
 /*
firmware/Makefile +1 -1
index 5d8ee13..cbb09ce 100644
@@ -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/qlogic/sd7220.fw.ihex renamed from firmware/intel/sd7220.fw.ihex +0 -0
similarity index 100%
rename from firmware/intel/sd7220.fw.ihex
rename to firmware/qlogic/sd7220.fw.ihex

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html