diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-05-24 22:47:54 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-24 22:47:54 +0200 |
| commit | 31ec97d9cebac804814de298592648f7c18d8281 (patch) | |
| tree | f725fcce0d5a9d6d7bd64b777de0a44e71773d0e /drivers/net/wireless/iwlwifi/iwl-1000.c | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | wireless: fix fatal kernel-doc error + warning in mac80211.h (diff) | |
| download | linux-31ec97d9cebac804814de298592648f7c18d8281.tar.xz linux-31ec97d9cebac804814de298592648f7c18d8281.zip | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-1000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index b4c81931e136..61d4a11f566b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c @@ -171,10 +171,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, - .txq_set_sched = iwlagn_txq_set_sched, - .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, - .txq_free_tfd = iwl_hw_txq_free_tfd, - .txq_init = iwl_hw_tx_queue_init, .rx_handler_setup = iwlagn_rx_handler_setup, .setup_deferred_work = iwlagn_setup_deferred_work, .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |