diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-28 17:50:06 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-28 17:50:06 -0400 |
| commit | eb1cf0f8f7a9e5a6d573d5bd72c015686a042db0 (patch) | |
| tree | ee5e1e52ef663e1a4d19c7abd6477a8ed75fda41 /drivers/net/wireless/iwlwifi/iwl-6000.c | |
| parent | 47379052b5c87707bc6e20a2a4f6ac156fb8357c (diff) | |
| parent | a0d97d6c7ceddc176b5eed171aa2a52e32cf3eda (diff) | |
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-6000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index 82b9c93dff54..c295b8ee9228 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
| @@ -100,6 +100,8 @@ static struct iwl_lib_ops iwl6000_lib = { | |||
| 100 | .setup_deferred_work = iwl5000_setup_deferred_work, | 100 | .setup_deferred_work = iwl5000_setup_deferred_work, |
| 101 | .is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr, | 101 | .is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr, |
| 102 | .load_ucode = iwl5000_load_ucode, | 102 | .load_ucode = iwl5000_load_ucode, |
| 103 | .dump_nic_event_log = iwl_dump_nic_event_log, | ||
| 104 | .dump_nic_error_log = iwl_dump_nic_error_log, | ||
| 103 | .init_alive_start = iwl5000_init_alive_start, | 105 | .init_alive_start = iwl5000_init_alive_start, |
| 104 | .alive_notify = iwl5000_alive_notify, | 106 | .alive_notify = iwl5000_alive_notify, |
| 105 | .send_tx_power = iwl5000_send_tx_power, | 107 | .send_tx_power = iwl5000_send_tx_power, |