diff options
author | Corey Minyard <minyard@acm.org> | 2005-11-07 03:59:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:44 -0500 |
commit | 21d6c542153c680f689a9badf5534bf27704350b (patch) | |
tree | a17cee6bbb6039a60d5c757ed99c901060f6d091 /drivers/char/ipmi/ipmi_poweroff.c | |
parent | cc4673eecdcc4a918e4d8796295d798b5e98d602 (diff) |
[PATCH] ipmi: poweroff cleanups
Make module_param and MODULE_PARAM_DESC agree on poweroff_powercycle name.
There was an extraneous ifdef in the IPMI poweroff code that prevented it from
working if PROC_FS was disabled.
Signed-off-by: Matt Domsch <Matt_Domsch@dell.com>
Signed-off-by: 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/ipmi/ipmi_poweroff.c')
-rw-r--r-- | drivers/char/ipmi/ipmi_poweroff.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c index f66947722e1..e053eade036 100644 --- a/drivers/char/ipmi/ipmi_poweroff.c +++ b/drivers/char/ipmi/ipmi_poweroff.c | |||
@@ -56,7 +56,7 @@ static int poweroff_powercycle; | |||
56 | 56 | ||
57 | /* parameter definition to allow user to flag power cycle */ | 57 | /* parameter definition to allow user to flag power cycle */ |
58 | module_param(poweroff_powercycle, int, 0644); | 58 | module_param(poweroff_powercycle, int, 0644); |
59 | MODULE_PARM_DESC(poweroff_powercycles, " Set to non-zero to enable power cycle instead of power down. Power cycle is contingent on hardware support, otherwise it defaults back to power down."); | 59 | MODULE_PARM_DESC(poweroff_powercycle, " Set to non-zero to enable power cycle instead of power down. Power cycle is contingent on hardware support, otherwise it defaults back to power down."); |
60 | 60 | ||
61 | /* Stuff from the get device id command. */ | 61 | /* Stuff from the get device id command. */ |
62 | static unsigned int mfg_id; | 62 | static unsigned int mfg_id; |
@@ -611,9 +611,7 @@ static int ipmi_poweroff_init (void) | |||
611 | } | 611 | } |
612 | #endif | 612 | #endif |
613 | 613 | ||
614 | #ifdef CONFIG_PROC_FS | ||
615 | rv = ipmi_smi_watcher_register(&smi_watcher); | 614 | rv = ipmi_smi_watcher_register(&smi_watcher); |
616 | #endif | ||
617 | if (rv) { | 615 | if (rv) { |
618 | unregister_sysctl_table(ipmi_table_header); | 616 | unregister_sysctl_table(ipmi_table_header); |
619 | printk(KERN_ERR PFX "Unable to register SMI watcher: %d\n", rv); | 617 | printk(KERN_ERR PFX "Unable to register SMI watcher: %d\n", rv); |