From: Adrian Bunk Remove the obsolete and no longer used include/linux/pm_legacy.h Reviewed-by: Robert P. J. Day Signed-off-by: Adrian Bunk Cc: Pavel Machek Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton --- arch/frv/kernel/pm.c | 1 arch/mips/au1000/common/power.c | 1 arch/x86/kernel/apm_32.c | 1 include/linux/pm_legacy.h | 35 ------------------------------ 4 files changed, 38 deletions(-) diff -puN arch/frv/kernel/pm.c~remove-include-linux-pm_legacyh arch/frv/kernel/pm.c --- a/arch/frv/kernel/pm.c~remove-include-linux-pm_legacyh +++ a/arch/frv/kernel/pm.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff -puN arch/mips/au1000/common/power.c~remove-include-linux-pm_legacyh arch/mips/au1000/common/power.c --- a/arch/mips/au1000/common/power.c~remove-include-linux-pm_legacyh +++ a/arch/mips/au1000/common/power.c @@ -31,7 +31,6 @@ #include #include -#include #include #include diff -puN arch/x86/kernel/apm_32.c~remove-include-linux-pm_legacyh arch/x86/kernel/apm_32.c --- a/arch/x86/kernel/apm_32.c~remove-include-linux-pm_legacyh +++ a/arch/x86/kernel/apm_32.c @@ -219,7 +219,6 @@ #include #include #include -#include #include #include #include diff -puN include/linux/pm_legacy.h~remove-include-linux-pm_legacyh /dev/null --- a/include/linux/pm_legacy.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef __LINUX_PM_LEGACY_H__ -#define __LINUX_PM_LEGACY_H__ - - -#ifdef CONFIG_PM_LEGACY - -/* - * Register a device with power management - */ -struct pm_dev __deprecated * -pm_register(pm_dev_t type, unsigned long id, pm_callback callback); - -/* - * Send a request to all devices - */ -int __deprecated pm_send_all(pm_request_t rqst, void *data); - -#else /* CONFIG_PM_LEGACY */ - -static inline struct pm_dev *pm_register(pm_dev_t type, - unsigned long id, - pm_callback callback) -{ - return NULL; -} - -static inline int pm_send_all(pm_request_t rqst, void *data) -{ - return 0; -} - -#endif /* CONFIG_PM_LEGACY */ - -#endif /* __LINUX_PM_LEGACY_H__ */ - _