diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-03 22:51:02 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-03 22:51:02 +0100 |
| commit | a7fca0ccecd3f5a111e08df8439f0b884099ad59 (patch) | |
| tree | 44b360a8f367e2414daf3ad92622ab2544ac0fbd /drivers/bluetooth/btmrvl_sdio.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/... (diff) | |
| parent | Bluetooth: Declare MODULE_FIRMWARE for Marvell SDIO driver (diff) | |
| download | linux-a7fca0ccecd3f5a111e08df8439f0b884099ad59.tar.xz linux-a7fca0ccecd3f5a111e08df8439f0b884099ad59.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'drivers/bluetooth/btmrvl_sdio.c')
| -rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 5b33b85790f2..1e6eb1aeba2b 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -930,6 +930,8 @@ static int btmrvl_sdio_probe(struct sdio_func *func, priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw; btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ); + priv->btmrvl_dev.psmode = 1; + btmrvl_enable_ps(priv); return 0; @@ -1001,3 +1003,5 @@ MODULE_AUTHOR("Marvell International Ltd."); MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION); MODULE_VERSION(VERSION); MODULE_LICENSE("GPL v2"); +MODULE_FIRMWARE("sd8688_helper.bin"); +MODULE_FIRMWARE("sd8688.bin"); |