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/pcie/drv.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/pcie/drv.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 |
1 files changed, 3 insertions, 1 deletions
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" |