aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorOlaf Hering <olh@suse.de>2006-03-24 06:16:15 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-24 10:33:24 -0500
commite933b6d6511dc80c63ab36fd584715371ae293c7 (patch)
tree96bc02983930590f4edc938a37ab14006e3d352b /drivers/char
parent5b3cf3e0f019fcfe1e0c26aedb4d54b5e5be3a7b (diff)
[PATCH] remove ipmi pm_power_off redefinition
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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ipmi/ipmi_poweroff.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c
index 49c09ae004bf..e8ed26b77d4c 100644
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
@@ -37,15 +37,13 @@
37#include <linux/proc_fs.h> 37#include <linux/proc_fs.h>
38#include <linux/string.h> 38#include <linux/string.h>
39#include <linux/completion.h> 39#include <linux/completion.h>
40#include <linux/pm.h>
40#include <linux/kdev_t.h> 41#include <linux/kdev_t.h>
41#include <linux/ipmi.h> 42#include <linux/ipmi.h>
42#include <linux/ipmi_smi.h> 43#include <linux/ipmi_smi.h>
43 44
44#define PFX "IPMI poweroff: " 45#define PFX "IPMI poweroff: "
45 46
46/* Where to we insert our poweroff function? */
47extern void (*pm_power_off)(void);
48
49/* Definitions for controlling power off (if the system supports it). It 47/* Definitions for controlling power off (if the system supports it). It
50 * conveniently matches the IPMI chassis control values. */ 48 * conveniently matches the IPMI chassis control values. */
51#define IPMI_CHASSIS_POWER_DOWN 0 /* power down, the default. */ 49#define IPMI_CHASSIS_POWER_DOWN 0 /* power down, the default. */