From patchwork Thu Jul 26 19:08:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 173480 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 89DAC2C00B1 for ; Fri, 27 Jul 2012 05:41:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753539Ab2GZTkz (ORCPT ); Thu, 26 Jul 2012 15:40:55 -0400 Received: from mail.tpi.com ([70.99.223.143]:1158 "EHLO mail.tpi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753420Ab2GZTkx (ORCPT ); Thu, 26 Jul 2012 15:40:53 -0400 X-Greylist: delayed 1967 seconds by postgrey-1.27 at vger.kernel.org; Thu, 26 Jul 2012 15:40:53 EDT Received: from salmon.rtg.net (mail.tpi.com [70.99.223.143]) by mail.tpi.com (Postfix) with ESMTP id 9740631326A; Thu, 26 Jul 2012 12:07:21 -0700 (PDT) Received: by salmon.rtg.net (Postfix, from userid 1000) id 9792B20AF1; Thu, 26 Jul 2012 13:08:36 -0600 (MDT) From: Tim Gardner To: linux-kernel@vger.kernel.org Cc: Tim Gardner , Jon Mason , "David S. Miller" , Joe Perches , Jiri Pirko , Stephen Hemminger , Paul Gortmaker , netdev@vger.kernel.org Subject: [PATCH] vxge: Declare MODULE_FIRMWARE usage Date: Thu, 26 Jul 2012 13:08:30 -0600 Message-Id: <1343329710-96747-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Cc: Jon Mason Cc: "David S. Miller" Cc: Joe Perches Cc: Jiri Pirko Cc: Stephen Hemminger Cc: Paul Gortmaker Cc: netdev@vger.kernel.org Signed-off-by: Tim Gardner --- drivers/net/ethernet/neterion/vxge/vxge-main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index de21904..d4832b2 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c @@ -4203,6 +4203,9 @@ out: return ret; } +#define VXGE_PXE_FIRMWARE "vxge/X3fw-pxe.ncf" +#define VXGE_FIRMWARE "vxge/X3fw.ncf" + static int vxge_probe_fw_update(struct vxgedev *vdev) { u32 maj, min, bld; @@ -4245,9 +4248,9 @@ static int vxge_probe_fw_update(struct vxgedev *vdev) } } if (gpxe) - fw_name = "vxge/X3fw-pxe.ncf"; + fw_name = VXGE_PXE_FIRMWARE; else - fw_name = "vxge/X3fw.ncf"; + fw_name = VXGE_FIRMWARE; ret = vxge_fw_upgrade(vdev, fw_name, 0); /* -EINVAL and -ENOENT are not fatal errors for flashing firmware on @@ -4855,3 +4858,5 @@ vxge_closer(void) } module_init(vxge_starter); module_exit(vxge_closer); +MODULE_FIRMWARE(VXGE_PXE_FIRMWARE); +MODULE_FIRMWARE(VXGE_FIRMWARE);