diff options
| author | Nagarjuna Kristam <nkristam@nvidia.com> | 2014-01-13 15:48:20 +0530 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2014-05-27 03:40:17 -0700 |
| commit | b1951cd5eb496e36d7d022d09598fc28ce80c367 (patch) | |
| tree | 4b7ccb6457124c346af10f15bbeb1aadf5d747c2 /drivers/bluetooth | |
| parent | a8568e92ceb58f3ac82a103a0f2cca41ef1cfe84 (diff) | |
drivers: bluetooth: sd8897: update Makefile
- Update Makefile to compile based on option in defconfig
- Update default module params, for proper driver initialization
when compiled part of kernel
Bug 1438249
Bug 1467982
Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
Change-Id: Ie1bfd031143c7e141bb4e2098444ff1d5b74ba5e
Reviewed-on: http://git-master/r/355032
(cherry picked from commit fb2a885e7e6fbb05cdf93ce8363764a712301e4d)
Reviewed-on: http://git-master/r/408747
Reviewed-by: Manikanta Maddireddy <mmaddireddy@nvidia.com>
Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/sd8897/Makefile | 2 | ||||
| -rw-r--r-- | drivers/bluetooth/sd8897/bt/bt_sdiommc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bluetooth/sd8897/Makefile b/drivers/bluetooth/sd8897/Makefile index e7f633627ec0..555074c12b54 100644 --- a/drivers/bluetooth/sd8897/Makefile +++ b/drivers/bluetooth/sd8897/Makefile @@ -44,7 +44,7 @@ BTOBJS = bt/bt_main.o bt/bt_sdiommc.o bt/bt_proc.o bt/mbt_char.o BTOBJS += bt/bt_init.o -obj-m := mbt8897.o +obj-$(CONFIG_SD8897) := mbt8897.o mbt8897-objs := $(BTOBJS) # End of file; diff --git a/drivers/bluetooth/sd8897/bt/bt_sdiommc.c b/drivers/bluetooth/sd8897/bt/bt_sdiommc.c index 59515f75d0cf..8d5c3de5ed2b 100644 --- a/drivers/bluetooth/sd8897/bt/bt_sdiommc.c +++ b/drivers/bluetooth/sd8897/bt/bt_sdiommc.c @@ -36,7 +36,7 @@ static char *fw_name; static int req_fw_nowait; static int multi_fn = BIT(2); -#define DEFAULT_FW_NAME "mrvl/sd8897_uapsta.bin" +#define DEFAULT_FW_NAME "sd8897_uapsta.bin" /** Function number 2 */ #define FN2 2 @@ -1762,4 +1762,4 @@ module_param(req_fw_nowait, int, 0); MODULE_PARM_DESC(req_fw_nowait, "0: Use request_firmware API; 1: Use request_firmware_nowait API"); module_param(multi_fn, int, 4); -MODULE_PARM_DESC(multi_fn, "Bit 2: FN2;"); +MODULE_PARM_DESC(multi_fn, "Bit 2: FN2;");
\ No newline at end of file |