4 files changed, 18 insertions, 3 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 866c91c..d1d9119 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -76,7 +76,9 @@
 #include "iwl-csr.h" /* for iwl_mvm_rx_card_state_notif */
 #include "iwl-io.h" /* for iwl_mvm_rx_card_state_notif */
 #include "iwl-prph.h"
+#ifdef CONFIG_ACPI
 #include "fw/acpi.h"
+#endif
 
 #include "mvm.h"
 #include "fw/dbg.h"
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index b1b41cd..a871835 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -91,7 +91,9 @@
 #include "tof.h"
 #include "fw/runtime.h"
 #include "fw/dbg.h"
+#ifdef CONFIG_ACPI
 #include "fw/acpi.h"
+#endif
 #include "iwl-nvm-parse.h"
 
 #include <linux/average.h>
@@ -768,12 +770,16 @@ enum iwl_mvm_queue_status {
 
 struct iwl_mvm_sar_profile {
 	bool enabled;
+#ifdef CONFIG_ACPI
 	u8 table[ACPI_SAR_TABLE_SIZE];
+#endif
 };
 
+#ifdef CONFIG_ACPI
 struct iwl_mvm_geo_profile {
 	u8 values[ACPI_GEO_TABLE_SIZE];
 };
+#endif
 
 struct iwl_mvm {
 	/* for logger access */
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;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index caa72be..9902dd6 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -88,7 +88,9 @@
 #include "time-event.h"
 #include "fw-api.h"
 #include "fw/api/scan.h"
+#ifdef CONFIG_ACPI
 #include "fw/acpi.h"
+#endif
 
 #define DRV_DESCRIPTION	"The new Intel(R) wireless AGN driver for Linux"
 MODULE_DESCRIPTION(DRV_DESCRIPTION);
@@ -498,8 +500,11 @@ static u32 iwl_mvm_min_backoff(struct iwl_mvm *mvm)
 
 	if (!backoff)
 		return 0;
-
+#ifdef CONFIG_ACPI
 	dflt_pwr_limit = iwl_acpi_get_pwr_limit(mvm->dev);
+#else
+	dflt_pwr_limit = 0;
+#endif
 
 	while (backoff->pwr) {
 		if (dflt_pwr_limit >= backoff->pwr)