diff options
| author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2017-11-21 16:35:43 +0000 |
|---|---|---|
| committer | Dominik Sliwa <dominik.sliwa@toradex.com> | 2018-09-18 13:01:26 +0200 |
| commit | d6a47bfb72f495a72637fbe635220f6af0f4cb6f (patch) | |
| tree | 599ca63f39f31243e55a7a62df8c98fd40e308de /drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | |
| parent | a5867d9e1f9f8096480104d80f9a8088dbde9209 (diff) | |
backports:Backports for tegra 3.1 and 3.10 kernels
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/nvm.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c index 4aa328b..66cf14a 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c @@ -75,7 +75,9 @@ #include "iwl-eeprom-read.h" #include "iwl-nvm-parse.h" #include "iwl-prph.h" +#ifdef CONFIG_ACPI #include "fw/acpi.h" +#endif /* Default NVM size to read */ #define IWL_NVM_DEFAULT_CHUNK_SIZE (2 * 1024) @@ -595,7 +597,7 @@ int iwl_mvm_init_mcc(struct iwl_mvm *mvm) regd = iwl_mvm_get_current_regdomain(mvm, NULL); if (IS_ERR_OR_NULL(regd)) return -EIO; - +#ifdef CONFIG_ACPI if (iwl_mvm_is_wifi_mcc_supported(mvm) && !iwl_acpi_get_mcc(mvm->dev, mcc)) { kfree(regd); @@ -604,7 +606,7 @@ int iwl_mvm_init_mcc(struct iwl_mvm *mvm) if (IS_ERR_OR_NULL(regd)) return -EIO; } - +#endif retval = regulatory_set_wiphy_regd_sync_rtnl(mvm->hw->wiphy, regd); kfree(regd); return retval; |