summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-1000.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-07-03 14:45:34 +0200
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-07-21 16:27:55 +0200
commit8d30119346d52516f289016e1c57f853a835cb4a (patch)
tree0f81159149ec2d015cf786065ea3ee66208a284c /drivers/net/wireless/iwlwifi/iwl-1000.c
parentiwlagn: add kick_nic API to transport layer (diff)
downloadlinux-8d30119346d52516f289016e1c57f853a835cb4a.tar.xz
linux-8d30119346d52516f289016e1c57f853a835cb4a.zip
iwlagn: kill iwlagn_rx_handler_setup
Since iwlagn_rx_handler_setup is always called, fold it into iwl_rx_handler_setup. BT related handlers are setup by the new bt_rx_handler_setup lib_ops. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-1000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-1000.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index fe15a46e4c7e..5fa171954099 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -168,7 +168,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)
static struct iwl_lib_ops iwl1000_lib = {
.set_hw_params = iwl1000_hw_set_hw_params,
- .rx_handler_setup = iwlagn_rx_handler_setup,
.setup_deferred_work = iwlagn_setup_deferred_work,
.nic_config = iwl1000_nic_config,
.eeprom_ops = {