diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-04-10 09:58:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-04-10 09:58:06 -0400 |
| commit | 029d3ac9722d23e4f3b65656878cb3e4d9e280d4 (patch) | |
| tree | a36c7979ab8735455128fd34e678bc6888d5c2ea /drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c | |
| parent | f34c4a35d87949fbb0e0f31eba3c054e9f8199ba (diff) | |
| parent | 5869e795e07ded955744ab99765d0f183f825f97 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c index b6722de64a31..33da3dfcfa4f 100644 --- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c +++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c | |||
| @@ -625,17 +625,7 @@ bool exhalbtc_initlize_variables(struct rtl_priv *adapter) | |||
| 625 | else | 625 | else |
| 626 | btcoexist->binded = true; | 626 | btcoexist->binded = true; |
| 627 | 627 | ||
| 628 | #if (defined(CONFIG_PCI_HCI)) | ||
| 629 | btcoexist->chip_interface = BTC_INTF_PCI; | ||
| 630 | #elif (defined(CONFIG_USB_HCI)) | ||
| 631 | btcoexist->chip_interface = BTC_INTF_USB; | ||
| 632 | #elif (defined(CONFIG_SDIO_HCI)) | ||
| 633 | btcoexist->chip_interface = BTC_INTF_SDIO; | ||
| 634 | #elif (defined(CONFIG_GSPI_HCI)) | ||
| 635 | btcoexist->chip_interface = BTC_INTF_GSPI; | ||
| 636 | #else | ||
| 637 | btcoexist->chip_interface = BTC_INTF_UNKNOWN; | 628 | btcoexist->chip_interface = BTC_INTF_UNKNOWN; |
| 638 | #endif | ||
| 639 | 629 | ||
| 640 | if (NULL == btcoexist->adapter) | 630 | if (NULL == btcoexist->adapter) |
| 641 | btcoexist->adapter = adapter; | 631 | btcoexist->adapter = adapter; |