summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorVinit Agnihotri2013-03-14 19:13:41 +0100
committerRoland Dreier2013-03-23 02:07:04 +0100
commite2eed58b4fbfe7cd59d0c9d7bec48fcfa3b2117a (patch)
treed5177116fbbb634c635a05b14690f65222adb1ac /firmware
parentIB/ipath: Silence a static checker warning (diff)
downloadkernel-qcow2-linux-e2eed58b4fbfe7cd59d0c9d7bec48fcfa3b2117a.tar.gz
kernel-qcow2-linux-e2eed58b4fbfe7cd59d0c9d7bec48fcfa3b2117a.tar.xz
kernel-qcow2-linux-e2eed58b4fbfe7cd59d0c9d7bec48fcfa3b2117a.zip
IB/qib: change QLogic to Intel
These changes modify the qib driver as part of acquiring the InfiniBand assets of QLogic. Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Reviewed-by: Dean Luick <dean.luick@intel.com> Signed-off-by: Vinit Agnihotri <vinit.abhay.agnihotri@intel.com> Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'firmware')
-rw-r--r--firmware/Makefile2
-rw-r--r--firmware/intel/sd7220.fw.ihex (renamed from firmware/qlogic/sd7220.fw.ihex)0
2 files changed, 1 insertions, 1 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index cbb09ce9730a..5d8ee1319b5c 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -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) += qlogic/sd7220.fw
+fw-shipped-$(CONFIG_INFINIBAND_QIB) += intel/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
diff --git a/firmware/qlogic/sd7220.fw.ihex b/firmware/intel/sd7220.fw.ihex
index a33636319112..a33636319112 100644
--- a/firmware/qlogic/sd7220.fw.ihex
+++ b/firmware/intel/sd7220.fw.ihex