From: Rafael J. Wysocki <rjw@xxxxxxx> Remove obsolete and no longer used PM-related definitions from include/asm-x86/nmi.h . Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> --- include/asm-x86/nmi.h | 21 --------------------- 1 file changed, 21 deletions(-) Index: linux-2.6/include/asm-x86/nmi.h =================================================================== --- linux-2.6.orig/include/asm-x86/nmi.h +++ linux-2.6/include/asm-x86/nmi.h @@ -15,27 +15,6 @@ */ int do_nmi_callback(struct pt_regs *regs, int cpu); -#ifdef CONFIG_PM - -/** Replace the PM callback routine for NMI. */ -struct pm_dev *set_nmi_pm_callback(pm_callback callback); - -/** Unset the PM callback routine back to the default. */ -void unset_nmi_pm_callback(struct pm_dev *dev); - -#else - -static inline struct pm_dev *set_nmi_pm_callback(pm_callback callback) -{ - return 0; -} - -static inline void unset_nmi_pm_callback(struct pm_dev *dev) -{ -} - -#endif /* CONFIG_PM */ - #ifdef CONFIG_X86_64 extern void default_do_nmi(struct pt_regs *); extern void die_nmi(char *str, struct pt_regs *regs, int do_panic); -- 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