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>

diff --git a/backport/backport-include/linux/suspend.h b/backport/backport-include/linux/suspend.h
deleted file mode 100644 (file)
index 394b164..0000000
--- 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 bda1865982c3d4dc3695b496768ce4aa35ad1672..0df2b8fae8c2ccd11c5e3d04626375abbe3c8b99 100644 (file)
--- 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