diff options
Diffstat (limited to 'drivers/net/wimax/i2400m/usb.c')
-rw-r--r-- | drivers/net/wimax/i2400m/usb.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c index 7c28610da6f..ca4151a9e22 100644 --- a/drivers/net/wimax/i2400m/usb.c +++ b/drivers/net/wimax/i2400m/usb.c | |||
@@ -73,7 +73,14 @@ | |||
73 | 73 | ||
74 | 74 | ||
75 | /* Our firmware file name */ | 75 | /* Our firmware file name */ |
76 | #define I2400MU_FW_FILE_NAME "i2400m-fw-usb-" I2400M_FW_VERSION ".sbcf" | 76 | static const char *i2400mu_bus_fw_names[] = { |
77 | #define I2400MU_FW_FILE_NAME_v1_4 "i2400m-fw-usb-1.4.sbcf" | ||
78 | I2400MU_FW_FILE_NAME_v1_4, | ||
79 | #define I2400MU_FW_FILE_NAME_v1_3 "i2400m-fw-usb-1.3.sbcf" | ||
80 | I2400MU_FW_FILE_NAME_v1_3, | ||
81 | NULL, | ||
82 | }; | ||
83 | |||
77 | 84 | ||
78 | static | 85 | static |
79 | int i2400mu_bus_dev_start(struct i2400m *i2400m) | 86 | int i2400mu_bus_dev_start(struct i2400m *i2400m) |
@@ -394,7 +401,7 @@ int i2400mu_probe(struct usb_interface *iface, | |||
394 | i2400m->bus_reset = i2400mu_bus_reset; | 401 | i2400m->bus_reset = i2400mu_bus_reset; |
395 | i2400m->bus_bm_cmd_send = i2400mu_bus_bm_cmd_send; | 402 | i2400m->bus_bm_cmd_send = i2400mu_bus_bm_cmd_send; |
396 | i2400m->bus_bm_wait_for_ack = i2400mu_bus_bm_wait_for_ack; | 403 | i2400m->bus_bm_wait_for_ack = i2400mu_bus_bm_wait_for_ack; |
397 | i2400m->bus_fw_name = I2400MU_FW_FILE_NAME; | 404 | i2400m->bus_fw_names = i2400mu_bus_fw_names; |
398 | i2400m->bus_bm_mac_addr_impaired = 0; | 405 | i2400m->bus_bm_mac_addr_impaired = 0; |
399 | 406 | ||
400 | #ifdef CONFIG_PM | 407 | #ifdef CONFIG_PM |
@@ -594,4 +601,5 @@ module_exit(i2400mu_driver_exit); | |||
594 | MODULE_AUTHOR("Intel Corporation <linux-wimax@intel.com>"); | 601 | MODULE_AUTHOR("Intel Corporation <linux-wimax@intel.com>"); |
595 | MODULE_DESCRIPTION("Intel 2400M WiMAX networking for USB"); | 602 | MODULE_DESCRIPTION("Intel 2400M WiMAX networking for USB"); |
596 | MODULE_LICENSE("GPL"); | 603 | MODULE_LICENSE("GPL"); |
597 | MODULE_FIRMWARE(I2400MU_FW_FILE_NAME); | 604 | MODULE_FIRMWARE(I2400MU_FW_FILE_NAME_v1_4); |
605 | MODULE_FIRMWARE(I2400MU_FW_FILE_NAME_v1_3); | ||