From: Rafael J. Wysocki <rjw@xxxxxxx> Some platforms, particualrly in the ARM tree, require that suspend_set_ops() and pm_suspend() be defined even if CONFIG_PM is not set. Make this requirement be satisfied. Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> --- include/linux/suspend.h | 7 +++++++ 1 file changed, 7 insertions(+) Index: linux-2.6.22-rc6/include/linux/suspend.h =================================================================== --- linux-2.6.22-rc6.orig/include/linux/suspend.h 2007-06-29 22:42:55.000000000 +0200 +++ linux-2.6.22-rc6/include/linux/suspend.h 2007-06-29 22:43:37.000000000 +0200 @@ -79,6 +79,7 @@ struct platform_suspend_ops { extern struct platform_suspend_ops *suspend_ops; +#ifdef CONFIG_PM /** * suspend_set_ops - set platform dependent suspend operations * @ops: The new suspend operations to set. @@ -105,6 +106,12 @@ extern void arch_suspend_disable_irqs(vo extern void arch_suspend_enable_irqs(void); extern int pm_suspend(suspend_state_t state); +#else /* CONFIG_PM */ +#define suspend_valid_only_mem NULL + +static inline void suspend_set_ops(struct platform_suspend_ops *ops) {} +static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; } +#endif /* CONFIG_PM */ /* struct pbe is used for creating lists of pages that should be restored * atomically during the resume from disk, because the page frames they have - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html