The patch titled remove include/linux/pm_legacy.h has been added to the -mm tree. Its filename is remove-include-linux-pm_legacyh.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: remove include/linux/pm_legacy.h From: Adrian Bunk <bunk@xxxxxxxxxx> Remove the obsolete and no longer used include/linux/pm_legacy.h Reviewed-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx> Cc: Pavel Machek <pavel@xxxxxxx> Cc: "Rafael J. Wysocki" <rjw@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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 <linux/init.h> #include <linux/module.h> #include <linux/pm.h> -#include <linux/pm_legacy.h> #include <linux/sched.h> #include <linux/interrupt.h> #include <linux/sysctl.h> 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 <linux/init.h> #include <linux/pm.h> -#include <linux/pm_legacy.h> #include <linux/sysctl.h> #include <linux/jiffies.h> 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 <linux/time.h> #include <linux/sched.h> #include <linux/pm.h> -#include <linux/pm_legacy.h> #include <linux/capability.h> #include <linux/device.h> #include <linux/kernel.h> 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__ */ - _ Patches currently in -mm which might be from bunk@xxxxxxxxxx are frv-dont-offer-binfmt_flat.patch linux-next.patch proper-prototype-for-acpi_processor_tstate_has_changed.patch remove-drivers-acorn-char-defkeymap-l7200c.patch drm-make-drm_minors_cleanup-static.patch if-0-ses_match_host.patch git-xtensa.patch mm-migratec-should-include-linux-syscallsh.patch mm-vmstatc-proper-externs.patch mm-hugetlbc-fix-duplicate-variable.patch remove-include-asm-h8300-keyboardh.patch remove-include-linux-pm_legacyh.patch remove-the-v850-port.patch init-do_mountsc-should-include-linux-initrdh.patch proper-spawn_ksoftirqd-prototype.patch build-kernel-profileo-only-when-requested.patch build-kernel-profileo-only-when-requested-cleanups.patch asm-generic-int-ll64h-always-provide-__su64.patch remove-some-more-tipar-bits.patch remove-the-oss-trident-driver.patch config_sound_wm97xx-remove-stale-makefile-line.patch serial-8250_gscc-add-module_license.patch mfd-sm501c-if-0-unused-functions.patch video-sis-remove-compat-code.patch minix-remove-no_truncate-code.patch remove-is_tty.patch proper-extern-for-mwave_s_mdd.patch if-0-hpet_unregister.patch unexport-proc_clear_tty.patch move-proc_kmsg_operations-to-fs-proc-internalh.patch proper-pidhashmap_init-prototypes.patch unexport-uts_sem.patch parport-sharec-proper-externs.patch tpm_biosc-make-2-structs-static.patch make-cgroup_seqfile_release-static.patch make-kprobe_blacklist-static.patch make-pnp_add_card_id-static.patch make-parport_cs_release-static.patch make-mm-sparsec-make-a-function-static.patch mm-allocpercpuc-make-4-functions-static.patch make-mm-memoryc-print_bad_pte-static.patch mm-swapfilec-make-code-static.patch make-mm-rmapc-anon_vma_cachep-static.patch drivers-char-rtcc-make-2-functions-static.patch make-init-do_mountsc-root_device_name-static.patch reiser4.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html