summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-1000.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-09-28 14:50:06 -0700
committerDavid S. Miller <davem@davemloft.net>2009-09-28 14:50:06 -0700
commiteb1cf0f8f7a9e5a6d573d5bd72c015686a042db0 (patch)
treeee5e1e52ef663e1a4d19c7abd6477a8ed75fda41 /drivers/net/wireless/iwlwifi/iwl-1000.c
parent47379052b5c87707bc6e20a2a4f6ac156fb8357c (diff)
parenta0d97d6c7ceddc176b5eed171aa2a52e32cf3eda (diff)
downloadop-kernel-dev-eb1cf0f8f7a9e5a6d573d5bd72c015686a042db0.zip
op-kernel-dev-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-1000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-1000.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index a95caa0..2716b91 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -99,6 +99,8 @@ static struct iwl_lib_ops iwl1000_lib = {
.setup_deferred_work = iwl5000_setup_deferred_work,
.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,
.load_ucode = iwl5000_load_ucode,
+ .dump_nic_event_log = iwl_dump_nic_event_log,
+ .dump_nic_error_log = iwl_dump_nic_error_log,
.init_alive_start = iwl5000_init_alive_start,
.alive_notify = iwl5000_alive_notify,
.send_tx_power = iwl5000_send_tx_power,
OpenPOWER on IntegriCloud