From e99c628ff46bc6409127c01bce3c8c104d605e24 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Thu, 12 Jun 2008 10:27:08 +0200
Subject: [PATCH] --- yaml --- r: 99396 b: refs/heads/master c:
 bf07dc864902b3e788de5ab50dc62d5677da90f2 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/include/asm-x86/nmi.h | 21 ---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 4a3915d46f75..bc262c61dfb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b80fe8bd732b5dd442118a43e02db22e8fd93e2
+refs/heads/master: bf07dc864902b3e788de5ab50dc62d5677da90f2
diff --git a/trunk/include/asm-x86/nmi.h b/trunk/include/asm-x86/nmi.h
index 8455bf36d8df..621bd090c1fb 100644
--- a/trunk/include/asm-x86/nmi.h
+++ b/trunk/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);