diff options
author | Johannes Berg <johannes.berg@intel.com> | 2017-09-15 09:32:09 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2017-09-15 09:32:09 +0200 |
commit | 75ed12f298e69fcf618aeeefe89e507f8cfac87a (patch) | |
tree | b9df7324e5df1d8eae01122c2b9964c82eef175b | |
parent | e09b2d34a2ace3cc9034c539ba15c712f6979460 (diff) |
backports: remove pm_system_wakeup(), add MWIFIEX dependency
Since only MWIFIEX needs pm_system_wakeup(), and that can't be
backported properly, remove it again and add a dependency for
MWIFIEX on kernel 3.18.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r-- | backport/backport-include/linux/suspend.h | 12 | ||||
-rw-r--r-- | dependencies | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/backport/backport-include/linux/suspend.h b/backport/backport-include/linux/suspend.h deleted file mode 100644 index 394b164b..00000000 --- a/backport/backport-include/linux/suspend.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __BP_LINUX_SUSPEND_H -#define __BP_LINUX_SUSPEND_H -#include_next <linux/suspend.h> - -#if LINUX_VERSION_IS_LESS(3,18,0) -static inline void pm_system_wakeup(void) -{ - freeze_wake(); -} -#endif - -#endif /* __BP_LINUX_SUSPEND_H */ diff --git a/dependencies b/dependencies index bda18659..0df2b8fa 100644 --- a/dependencies +++ b/dependencies @@ -62,6 +62,10 @@ NFC_NXP_NCI_I2C 3.17 # pci_error_handlers->reset_notify is missing MWIFIEX_PCIE 3.16 +# needs pm_system_wakeup() which can't reall be +# backported properly +MWIFIEX 3.18 + # this needs device_property..() functions and struct acpi_gpio_mapping NFC_FDP_I2C 3.19 NFC_ST21NFCA_I2C 3.19 |