From d6a47bfb72f495a72637fbe635220f6af0f4cb6f Mon Sep 17 00:00:00 2001
From: Dominik Sliwa <dominik.sliwa@toradex.com>
Date: Tue, 21 Nov 2017 16:35:43 +0000
Subject: backports:Backports for tegra 3.1 and 3.10 kernels

Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
---
 drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'drivers/net/wireless/intel/iwlwifi/pcie/drv.c')

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 0ed7d68..feba7d7 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -73,9 +73,11 @@
 #include <linux/pm_runtime.h>
 #include <linux/pci.h>
 #include <linux/pci-aspm.h>
-#include <linux/acpi.h>
 
+#ifdef CONFIG_ACPI
+#include <linux/acpi.h>
 #include "fw/acpi.h"
+#endif
 
 #include "iwl-trans.h"
 #include "iwl-drv.h"
-- 
cgit v1.2.3