Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162411Ab3DESaT (ORCPT ); Fri, 5 Apr 2013 14:30:19 -0400 Received: from mga14.intel.com ([143.182.124.37]:6633 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162389Ab3DESaR (ORCPT ); Fri, 5 Apr 2013 14:30:17 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,416,1363158000"; d="scan'208";a="223347898" Subject: [PATCH v3] firmware,IB/qib: revert firmware file move To: roland@purestorage.com From: Mike Marciniszyn Cc: Dean Luick , linux-rdma@vger.kernel.org, Linus Torvalds , Vinit Abhay Agnihotri , linux-kernel@vger.kernel.org, David Woodhouse Date: Fri, 05 Apr 2013 14:30:13 -0400 Message-ID: <20130405183013.4047.7691.stgit@phlsvslse11.ph.intel.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2073 Lines: 51 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. Reported-by: David Woodhouse Signed-off-by: Mike Marciniszyn --- 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%) diff --git a/drivers/infiniband/hw/qib/qib_sd7220.c b/drivers/infiniband/hw/qib/qib_sd7220.c index 08a6c6d..911205d 100644 --- a/drivers/infiniband/hw/qib/qib_sd7220.c +++ b/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/firmware/Makefile b/firmware/Makefile index 5d8ee13..cbb09ce 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) += 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/firmware/intel/sd7220.fw.ihex b/firmware/qlogic/sd7220.fw.ihex 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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/