]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] remove ipmi pm_power_off redefinition
authorOlaf Hering <olh@suse.de>
Fri, 24 Mar 2006 11:16:15 +0000 (03:16 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 24 Mar 2006 15:33:24 +0000 (07:33 -0800)
Use the global define of pm_power_off

Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/char/ipmi/ipmi_poweroff.c

index 49c09ae004bffc324162a45710f631552ba1f220..e8ed26b77d4c71982ccb00c932ee353d432168bf 100644 (file)
 #include <linux/proc_fs.h>
 #include <linux/string.h>
 #include <linux/completion.h>
+#include <linux/pm.h>
 #include <linux/kdev_t.h>
 #include <linux/ipmi.h>
 #include <linux/ipmi_smi.h>
 
 #define PFX "IPMI poweroff: "
 
-/* Where to we insert our poweroff function? */
-extern void (*pm_power_off)(void);
-
 /* Definitions for controlling power off (if the system supports it).  It
  * conveniently matches the IPMI chassis control values. */
 #define IPMI_CHASSIS_POWER_DOWN                0       /* power down, the default. */