[PATCH] libertas sdio: look for 8688 firmware in common location
From: Lubomir Rintel <lkundrak@v3.sk>
Date: 2013-01-18 07:39:50
Also in:
lkml
Subsystem:
networking drivers (wireless), the rest · Maintainers:
Johannes Berg, Linus Torvalds
sd8688 is not only used by libertas WiFi, but shared with btmrvl bluetooth as well. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> --- drivers/net/wireless/libertas/if_sdio.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index 739309e..be16a76 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c@@ -85,6 +85,7 @@ static const struct lbs_fw_table fw_table[] = { { MODEL_8686, "libertas/sd8686_v9_helper.bin", "libertas/sd8686_v9.bin" }, { MODEL_8686, "libertas/sd8686_v8_helper.bin", "libertas/sd8686_v8.bin" }, { MODEL_8686, "sd8686_helper.bin", "sd8686.bin" }, + { MODEL_8688, "mrvl/sd8688_helper.bin", "mrvl/sd8688.bin" }, { MODEL_8688, "libertas/sd8688_helper.bin", "libertas/sd8688.bin" }, { MODEL_8688, "sd8688_helper.bin", "sd8688.bin" }, { 0, NULL, NULL }
@@ -99,6 +100,8 @@ MODULE_FIRMWARE("libertas/sd8686_v8_helper.bin"); MODULE_FIRMWARE("libertas/sd8686_v8.bin"); MODULE_FIRMWARE("sd8686_helper.bin"); MODULE_FIRMWARE("sd8686.bin"); +MODULE_FIRMWARE("mrvl/sd8688_helper.bin"); +MODULE_FIRMWARE("mrvl/sd8688.bin"); MODULE_FIRMWARE("libertas/sd8688_helper.bin"); MODULE_FIRMWARE("libertas/sd8688.bin"); MODULE_FIRMWARE("sd8688_helper.bin");
--
1.7.1