From 09cae738b9324469e4402dfdf335f9173a09af7d Mon Sep 17 00:00:00 2001 From: Mike Marciniszyn Date: Fri, 5 Apr 2013 14:30:13 -0400 Subject: [PATCH] --- yaml --- r: 362249 b: refs/heads/master c: ff802e31b5e60a9a39f70479947a27cea5da701c h: refs/heads/master i: 362247: b104da4348ecb18f255a6480ce52c1115310a167 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/qib/qib_sd7220.c | 2 +- trunk/firmware/Makefile | 2 +- trunk/firmware/{intel => qlogic}/sd7220.fw.ihex | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename trunk/firmware/{intel => qlogic}/sd7220.fw.ihex (100%) diff --git a/[refs] b/[refs] index 125cc798c1db..e56d5ca579a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0a77f26312a8b23b6040073c50b0c19b82ce8b4 +refs/heads/master: ff802e31b5e60a9a39f70479947a27cea5da701c diff --git a/trunk/drivers/infiniband/hw/qib/qib_sd7220.c b/trunk/drivers/infiniband/hw/qib/qib_sd7220.c index 08a6c6d39e56..911205d3d5a0 100644 --- a/trunk/drivers/infiniband/hw/qib/qib_sd7220.c +++ b/trunk/drivers/infiniband/hw/qib/qib_sd7220.c @@ -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); /* diff --git a/trunk/firmware/Makefile b/trunk/firmware/Makefile index 5d8ee1319b5c..cbb09ce9730a 100644 --- a/trunk/firmware/Makefile +++ b/trunk/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) += 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 diff --git a/trunk/firmware/intel/sd7220.fw.ihex b/trunk/firmware/qlogic/sd7220.fw.ihex similarity index 100% rename from trunk/firmware/intel/sd7220.fw.ihex rename to trunk/firmware/qlogic/sd7220.fw.ihex