diff options
author | David S. Miller <davem@davemloft.net> | 2009-09-28 14:50:06 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-28 14:50:06 -0700 |
commit | eb1cf0f8f7a9e5a6d573d5bd72c015686a042db0 (patch) | |
tree | ee5e1e52ef663e1a4d19c7abd6477a8ed75fda41 /drivers/net/wireless/iwlwifi/iwl-4965.c | |
parent | 47379052b5c87707bc6e20a2a4f6ac156fb8357c (diff) | |
parent | a0d97d6c7ceddc176b5eed171aa2a52e32cf3eda (diff) | |
download | linux-stable-eb1cf0f8f7a9e5a6d573d5bd72c015686a042db0.tar.gz |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 3259b8841544..a22a0501c190 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -2298,6 +2298,8 @@ static struct iwl_lib_ops iwl4965_lib = { .alive_notify = iwl4965_alive_notify, .init_alive_start = iwl4965_init_alive_start, .load_ucode = iwl4965_load_bsm, + .dump_nic_event_log = iwl_dump_nic_event_log, + .dump_nic_error_log = iwl_dump_nic_error_log, .apm_ops = { .init = iwl4965_apm_init, .reset = iwl4965_apm_reset, |