diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-25 16:39:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-25 16:39:06 -0400 |
| commit | 48b81cc1d9fa469a50fd3b7c95ae38e748920ec1 (patch) | |
| tree | 514964b1d090f424435c167f2781eac8e6c6374a /drivers/bluetooth | |
| parent | 31c5770b5d7354c308bd41bf2bb3e02e5e0e95b6 (diff) | |
| parent | 0227c7b56959cd8f5edd20b6a47db86fa553e91a (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 9959d4cb23dc..1cb51839912d 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c | |||
| @@ -83,8 +83,8 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = { | |||
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| 85 | static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = { | 85 | static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = { |
| 86 | .helper = "sd8688_helper.bin", | 86 | .helper = "mrvl/sd8688_helper.bin", |
| 87 | .firmware = "sd8688.bin", | 87 | .firmware = "mrvl/sd8688.bin", |
| 88 | .reg = &btmrvl_reg_8688, | 88 | .reg = &btmrvl_reg_8688, |
| 89 | .sd_blksz_fw_dl = 64, | 89 | .sd_blksz_fw_dl = 64, |
| 90 | }; | 90 | }; |
| @@ -1185,7 +1185,7 @@ MODULE_AUTHOR("Marvell International Ltd."); | |||
| 1185 | MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION); | 1185 | MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION); |
| 1186 | MODULE_VERSION(VERSION); | 1186 | MODULE_VERSION(VERSION); |
| 1187 | MODULE_LICENSE("GPL v2"); | 1187 | MODULE_LICENSE("GPL v2"); |
| 1188 | MODULE_FIRMWARE("sd8688_helper.bin"); | 1188 | MODULE_FIRMWARE("mrvl/sd8688_helper.bin"); |
| 1189 | MODULE_FIRMWARE("sd8688.bin"); | 1189 | MODULE_FIRMWARE("mrvl/sd8688.bin"); |
| 1190 | MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin"); | 1190 | MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin"); |
| 1191 | MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin"); | 1191 | MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin"); |