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>
Signed-off-by: Andi Kleen <ak@linux.intel.com>

diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index ffa1b9ce1cc5a8f4c474136940df4de36d853c55..e883d4c65d30ba1e781de6836e832f44582c0b24 100644 (file)
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -522,7 +522,6 @@ struct uni_data_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 81f982aa334cd016d5f0719a8b4374de7fa06568..211799740291a4c2be2e90713b918b3b23429007 100644 (file)
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -971,7 +971,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 6ce6ce1df6d2c16eda31bbd8a48b07c162949e28..ca3bbd8a4382e6be10194a84db47d8c38610e8ae 100644 (file)
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -44,7 +44,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[] = "QLogic/NetXen Network Driver v"