aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2009-05-27 04:12:51 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-06-03 14:05:15 -0400
commit328d84fb3614d006254c990a6224ce437147a5ac (patch)
tree6b4d628b23ae2bad40658a16df6ea555bd7005ee
parent939cab83ea592fcf4d854563d6c71d813a691872 (diff)
wireless/p54: prepare for FIRMWARE_NAME_MAX removal
We're going to remove the FIRMWARE_NAME_MAX definition in order to avoid any firmware name length restriction. This patch gets rid of the statically allocated p54usb firmware string, and replaces them with const char pointers. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/p54/p54usb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index f40c0f468b27..0e877a104a89 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -84,8 +84,8 @@ MODULE_DEVICE_TABLE(usb, p54u_table);
84static const struct { 84static const struct {
85 u32 intf; 85 u32 intf;
86 enum p54u_hw_type type; 86 enum p54u_hw_type type;
87 char fw[FIRMWARE_NAME_MAX]; 87 const char *fw;
88 char fw_legacy[FIRMWARE_NAME_MAX]; 88 const char *fw_legacy;
89 char hw[20]; 89 char hw[20];
90} p54u_fwlist[__NUM_P54U_HWTYPES] = { 90} p54u_fwlist[__NUM_P54U_HWTYPES] = {
91 { 91 {