diff options
| author | David S. Miller | 2011-02-14 21:51:42 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-02-14 21:51:42 +0100 |
| commit | 8bc26a008f61eac5631701cbd65f88c015a63280 (patch) | |
| tree | c85eb9e5a14b406a4dd6625c57029ec266e7dc80 /drivers/net | |
| parent | net/can/softing: make CAN_SOFTING_CS depend on CAN_SOFTING (diff) | |
| parent | mac80211: add missing locking in ieee80211_reconfig (diff) | |
| download | kernel-qcow2-linux-8bc26a008f61eac5631701cbd65f88c015a63280.tar.gz kernel-qcow2-linux-8bc26a008f61eac5631701cbd65f88c015a63280.tar.xz kernel-qcow2-linux-8bc26a008f61eac5631701cbd65f88c015a63280.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index a9b852be4509..3eb14fd2204b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c @@ -2734,7 +2734,6 @@ static struct iwl_lib_ops iwl3945_lib = { .isr_ops = { .isr = iwl_isr_legacy, }, - .check_plcp_health = iwl3945_good_plcp_health, .debugfs_ops = { .rx_stats_read = iwl3945_ucode_rx_stats_read, |