netxen: Remove references to unified firmware file

Commit c23a103f0d9c2560c6839ed366feebec4cd5e556 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>

diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 71975ba5662a8cdedb11667c0b6dc4ca000e349c..e52af5b75b182e8a0ba15c2c8fa6f228a91d4cac 100644 (file)
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -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[];

diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 562a48868f20cdbd12929c17f0880a308f30496a..7167c91590add89ba8779fe97ad2c28ce33dcf56 100644 (file)
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -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,
 };
 

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 9890a7eb2b0719cc8d2d08d5a894a3f62272deb3..166fc236ace75c544236b9aff040f5eaad13941f 100644 (file)
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -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 "