diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-28 23:13:36 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-28 23:13:36 -0400 |
| commit | ab11d1ea281e85895369ef57c5259ad8a432fabb (patch) | |
| tree | 684147479c6a8bb2fbed21bdcf12de1dd519c730 /drivers/char/ipmi/ipmi_poweroff.c | |
| parent | 952ecef7a0479049c8abb7c34a688ec2981ceadd (diff) | |
| parent | 664cceb0093b755739e56572b836a99104ee8a75 (diff) | |
Merge by hand from Linus' tree.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/char/ipmi/ipmi_poweroff.c')
| -rw-r--r-- | drivers/char/ipmi/ipmi_poweroff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c index e82a96ba396..f66947722e1 100644 --- a/drivers/char/ipmi/ipmi_poweroff.c +++ b/drivers/char/ipmi/ipmi_poweroff.c | |||
| @@ -55,7 +55,7 @@ extern void (*pm_power_off)(void); | |||
| 55 | static int poweroff_powercycle; | 55 | 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, 0); | 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_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."); |
| 60 | 60 | ||
| 61 | /* Stuff from the get device id command. */ | 61 | /* Stuff from the get device id command. */ |