Commit 2159ad12 authored by Tim Gardner's avatar Tim Gardner

UBUNTU: SAUCE: (no-up) vxge: Declare MODULE_FIRMWARE usage

Obsolete driver, but this helps get rid of extra firmware. Upstream hates it.
https://lkml.org/lkml/2012/4/12/401

Cc: Jon Mason <jdmason@kudzu.us>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Joe Perches <joe@perches.com>
Cc: Jiri Pirko <jpirko@redhat.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent 04d9a649
...@@ -4219,6 +4219,9 @@ int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override) ...@@ -4219,6 +4219,9 @@ int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override)
return ret; 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) static int vxge_probe_fw_update(struct vxgedev *vdev)
{ {
u32 maj, min, bld; u32 maj, min, bld;
...@@ -4261,9 +4264,9 @@ static int vxge_probe_fw_update(struct vxgedev *vdev) ...@@ -4261,9 +4264,9 @@ static int vxge_probe_fw_update(struct vxgedev *vdev)
} }
} }
if (gpxe) if (gpxe)
fw_name = "vxge/X3fw-pxe.ncf"; fw_name = VXGE_PXE_FIRMWARE;
else else
fw_name = "vxge/X3fw.ncf"; fw_name = VXGE_FIRMWARE;
ret = vxge_fw_upgrade(vdev, fw_name, 0); ret = vxge_fw_upgrade(vdev, fw_name, 0);
/* -EINVAL and -ENOENT are not fatal errors for flashing firmware on /* -EINVAL and -ENOENT are not fatal errors for flashing firmware on
...@@ -4868,3 +4871,5 @@ vxge_closer(void) ...@@ -4868,3 +4871,5 @@ vxge_closer(void)
} }
module_init(vxge_starter); module_init(vxge_starter);
module_exit(vxge_closer); module_exit(vxge_closer);
MODULE_FIRMWARE(VXGE_PXE_FIRMWARE);
MODULE_FIRMWARE(VXGE_FIRMWARE);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment