diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-29 23:15:03 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-29 23:15:03 +0300 |
| commit | f5004a14fac0a71656340544c48a14c80a3afddf (patch) | |
| tree | c92b514ef46049e3050ed95e3065ae2190d3d3fc /drivers/bluetooth/btintel.c | |
| parent | 6d74232410a9f3ed0e1fc0f5e538598f21e93982 (diff) | |
| parent | 917522aae169ad02010dcee6ae42c16155bcd285 (diff) | |
| download | linux-f5004a14fac0a71656340544c48a14c80a3afddf.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2015-08-28
One more bunch of Bluetooth patches for 4.3:
- Crash fix for hci_bcm driver
- Enhancements to hci_intel driver (e.g. baudrate configuration)
- Fix for SCO link type after multiple connect attempts
- Cleanups & minor fixes in a few other places
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bluetooth/btintel.c')
| -rw-r--r-- | drivers/bluetooth/btintel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index 1ce4ac16c7fa..048423fd83bf 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -173,3 +173,5 @@ MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION); MODULE_VERSION(VERSION); MODULE_LICENSE("GPL"); +MODULE_FIRMWARE("intel/ibt-11-5.sfi"); +MODULE_FIRMWARE("intel/ibt-11-5.ddc"); |