summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-6000.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-03-07 09:52:18 -0800
committerJohn W. Linville <linville@tuxdriver.com>2012-03-08 13:59:48 -0500
commit562f08eb8020cf3672c3743752f82d962ecb7788 (patch)
treeee0bbf3eb04360cd5f477da9956e518d5ec7f91d /drivers/net/wireless/iwlwifi/iwl-6000.c
parentb0b4619273dd8b9414a4632f8f229e4f2897ff45 (diff)
downloadlinux-562f08eb8020cf3672c3743752f82d962ecb7788.tar.gz
linux-562f08eb8020cf3672c3743752f82d962ecb7788.tar.bz2
linux-562f08eb8020cf3672c3743752f82d962ecb7788.zip
iwlwifi: remove BT handlers from lib_ops
There's no need to have operations for these as they simply depend on whether the device has built-in bluetooth, so just duplicate the information already there (whether bt_params is present or not). Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-6000.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index d299f05dfc9b..904c50af92fd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -252,9 +252,6 @@ static struct iwl_lib_ops iwl6000_lib = {
static struct iwl_lib_ops iwl6030_lib = {
.set_hw_params = iwl6000_hw_set_hw_params,
- .bt_rx_handler_setup = iwlagn_bt_rx_handler_setup,
- .bt_setup_deferred_work = iwlagn_bt_setup_deferred_work,
- .cancel_deferred_work = iwlagn_bt_cancel_deferred_work,
.set_channel_switch = iwl6000_hw_channel_switch,
.nic_config = iwl6000_nic_config,
.eeprom_ops = {