diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-14 20:51:42 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-14 20:51:42 (GMT) |
commit | 8bc26a008f61eac5631701cbd65f88c015a63280 (patch) | |
tree | c85eb9e5a14b406a4dd6625c57029ec266e7dc80 /drivers/net | |
parent | ddfdb508866b3c07b295f6c85c271981d88afe4c (diff) | |
parent | a7b545f7fe753ca3dc1b51ca57f90cd59d974e44 (diff) | |
download | linux-fsl-qoriq-8bc26a008f61eac5631701cbd65f88c015a63280.tar.xz |
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 a9b852b..3eb14fd 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, |