From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 7 Jun 2011 18:07:11 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=41bfce8edebbe9dc6ddc238a71f07fbe9ab46016;p=~shefty%2Frdma-dev.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
---

41bfce8edebbe9dc6ddc238a71f07fbe9ab46016
diff --cc drivers/net/wireless/iwlwifi/iwl-2000.c
index a37c41b405c,2282279cffc..5484ab712da
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@@ -256,8 -183,8 +183,7 @@@ static struct iwl_lib_ops iwl2000_lib 
  	.setup_deferred_work = iwlagn_bt_setup_deferred_work,
  	.cancel_deferred_work = iwlagn_bt_cancel_deferred_work,
  	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
 -	.send_tx_power = iwlagn_send_tx_power,
  	.update_chain_flags = iwl_update_chain_flags,
- 	.set_channel_switch = iwl2030_hw_channel_switch,
  	.apm_ops = {
  		.init = iwl_apm_init,
  		.config = iwl2000_nic_config,