summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-1000.c
diff options
context:
space:
mode:
authorFry, Donald H <donald.h.fry@intel.com>2011-07-08 08:46:18 -0700
committerJohn W. Linville <linville@tuxdriver.com>2011-07-11 15:02:04 -0400
commite4c598b7ce36f4416f7672617265bc1fa92e5a5f (patch)
tree166df484e9e9ba56f0a435475b9d9a30ec353ce4 /drivers/net/wireless/iwlwifi/iwl-1000.c
parent6b6db91c8aa14fa9bd041321026d69b9f6ea42ff (diff)
downloadblackbird-op-linux-e4c598b7ce36f4416f7672617265bc1fa92e5a5f.tar.gz
blackbird-op-linux-e4c598b7ce36f4416f7672617265bc1fa92e5a5f.zip
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.c5
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 = {
.rx_handler_setup = iwlagn_rx_handler_setup,
.setup_deferred_work = iwlagn_setup_deferred_work,
.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
- .apm_ops = {
- .init = iwl_apm_init,
- .config = iwl1000_nic_config,
- },
+ .nic_config = iwl1000_nic_config,
.eeprom_ops = {
.regulatory_bands = {
EEPROM_REG_BAND_1_CHANNELS,
OpenPOWER on IntegriCloud