diff options
| author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2017-12-22 12:07:34 +0000 |
|---|---|---|
| committer | Dominik Sliwa <dominik.sliwa@toradex.com> | 2018-09-18 17:15:11 +0200 |
| commit | 69ff0b5709d0d06545fcb2d08c7645b56d3687dd (patch) | |
| tree | 71f1569cc019e16c1b1be22c1e8d382766daebb3 /drivers/bluetooth | |
| parent | d6a47bfb72f495a72637fbe635220f6af0f4cb6f (diff) | |
backports: bluetooth: Support 4.9 kernels
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/Makefile | 2 | ||||
| -rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile index 8f0e8d8..9b8bda8 100644 --- a/drivers/bluetooth/Makefile +++ b/drivers/bluetooth/Makefile @@ -30,7 +30,7 @@ obj-$(CPTCFG_BT_HCIUART_NOKIA) += hci_nokia.o obj-$(CPTCFG_BT_HCIRSI) += btrsi.o btmrvl-y := btmrvl_main.o -btmrvl-$(CONFIG_DEBUG_FS) += btmrvl_debugfs.o +btmrvl-$(CPTCFG_DEBUG_FS) += btmrvl_debugfs.o hci_uart-y := hci_ldisc.o hci_uart-$(CPTCFG_BT_HCIUART_SERDEV) += hci_serdev.o diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 888bac4..26ea804 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -1310,6 +1310,7 @@ rdwr_status btmrvl_sdio_rdwr_firmware(struct btmrvl_private *priv, return RDWR_STATUS_SUCCESS; } +#if LINUX_VERSION_IS_GEQ(4,16,0) /* This function dump sdio register and memory data */ static void btmrvl_sdio_coredump(struct device *dev) { @@ -1493,6 +1494,7 @@ done: dev_coredumpv(&card->func->dev, fw_dump_data, fw_dump_len, GFP_KERNEL); BT_INFO("== btmrvl firmware dump to /sys/class/devcoredump end"); } +#endif static int btmrvl_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id) @@ -1721,7 +1723,9 @@ static struct sdio_driver bt_mrvl_sdio = { .remove = btmrvl_sdio_remove, .drv = { .owner = THIS_MODULE, +#if LINUX_VERSION_IS_GEQ(4,16,0) .coredump = btmrvl_sdio_coredump, +#endif .pm = &btmrvl_sdio_pm_ops, } }; |