diff options
author | Fry, Donald H <donald.h.fry@intel.com> | 2011-07-08 11:46:18 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-11 15:02:04 -0400 |
commit | e4c598b7ce36f4416f7672617265bc1fa92e5a5f (patch) | |
tree | 166df484e9e9ba56f0a435475b9d9a30ec353ce4 /drivers/net/wireless/iwlwifi/iwl-1000.c | |
parent | 6b6db91c8aa14fa9bd041321026d69b9f6ea42ff (diff) |
iwlagn: remove the indirection for iwl_apm_init
Not needed since the driver split.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-1000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index 11f10c13af57..5be27672eb90 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c | |||
@@ -171,10 +171,7 @@ static struct iwl_lib_ops iwl1000_lib = { | |||
171 | .rx_handler_setup = iwlagn_rx_handler_setup, | 171 | .rx_handler_setup = iwlagn_rx_handler_setup, |
172 | .setup_deferred_work = iwlagn_setup_deferred_work, | 172 | .setup_deferred_work = iwlagn_setup_deferred_work, |
173 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, | 173 | .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr, |
174 | .apm_ops = { | 174 | .nic_config = iwl1000_nic_config, |
175 | .init = iwl_apm_init, | ||
176 | .config = iwl1000_nic_config, | ||
177 | }, | ||
178 | .eeprom_ops = { | 175 | .eeprom_ops = { |
179 | .regulatory_bands = { | 176 | .regulatory_bands = { |
180 | EEPROM_REG_BAND_1_CHANNELS, | 177 | EEPROM_REG_BAND_1_CHANNELS, |