mirror of
https://github.com/torvalds/linux.git
synced 2026-06-08 22:52:35 +02:00
netxen: Remove references to unified firmware file
Commit c23a103f0d wrongly introduced
references to the unified firmware file "phanfw.bin", which is not
supported by netxen in 2.6.32. The driver reports this filename when
loading firmware from flash, and includes a MODULE_FIRMWARE hint for
the filename even though it will never use it.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
a7c1523fe5
commit
59b85444d4
|
|
@ -490,7 +490,6 @@ struct status_desc {
|
|||
#define NX_P2_MN_ROMIMAGE_NAME "nxromimg.bin"
|
||||
#define NX_P3_CT_ROMIMAGE_NAME "nx3fwct.bin"
|
||||
#define NX_P3_MN_ROMIMAGE_NAME "nx3fwmn.bin"
|
||||
#define NX_UNIFIED_ROMIMAGE_NAME "phanfw.bin"
|
||||
#define NX_FLASH_ROMIMAGE_NAME "flash"
|
||||
|
||||
extern char netxen_nic_driver_name[];
|
||||
|
|
|
|||
|
|
@ -676,7 +676,6 @@ static char *fw_name[] = {
|
|||
NX_P2_MN_ROMIMAGE_NAME,
|
||||
NX_P3_CT_ROMIMAGE_NAME,
|
||||
NX_P3_MN_ROMIMAGE_NAME,
|
||||
NX_UNIFIED_ROMIMAGE_NAME,
|
||||
NX_FLASH_ROMIMAGE_NAME,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@ MODULE_VERSION(NETXEN_NIC_LINUX_VERSIONID);
|
|||
MODULE_FIRMWARE(NX_P2_MN_ROMIMAGE_NAME);
|
||||
MODULE_FIRMWARE(NX_P3_CT_ROMIMAGE_NAME);
|
||||
MODULE_FIRMWARE(NX_P3_MN_ROMIMAGE_NAME);
|
||||
MODULE_FIRMWARE(NX_UNIFIED_ROMIMAGE_NAME);
|
||||
|
||||
char netxen_nic_driver_name[] = "netxen_nic";
|
||||
static char netxen_nic_driver_string[] = "NetXen Network Driver version "
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user