diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-14 15:32:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-14 15:32:16 -0500 |
commit | 0a80939b3e6af4b0dc93bf88ec02fd7e90a16f1b (patch) | |
tree | a112335f2b2b2a51e90531c6c67e8a3b54dcf0ef /drivers/char/i8k.c | |
parent | 0b48d42235caf627121f440b57d376f48a9af8b6 (diff) | |
parent | 72db395ffadb1d33233fd123c2bf87ba0198c6c1 (diff) |
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1
* tag 'for-linus' of git://github.com/rustyrussell/linux:
module_param: check that bool parameters really are bool.
intelfbdrv.c: bailearly is an int module_param
paride/pcd: fix bool verbose module parameter.
module_param: make bool parameters really bool (drivers & misc)
module_param: make bool parameters really bool (arch)
module_param: make bool parameters really bool (core code)
kernel/async: remove redundant declaration.
printk: fix unnecessary module_param_name.
lirc_parallel: fix module parameter description.
module_param: avoid bool abuse, add bint for special cases.
module_param: check type correctness for module_param_array
modpost: use linker section to generate table.
modpost: use a table rather than a giant if/else statement.
modules: sysfs - export: taint, coresize, initsize
kernel/params: replace DEBUGP with pr_debug
module: replace DEBUGP with pr_debug
module: struct module_ref should contains long fields
module: Fix performance regression on modules with large symbol tables
module: Add comments describing how the "strmap" logic works
Fix up conflicts in scripts/mod/file2alias.c due to the new linker-
generated table approach to adding __mod_*_device_table entries. The
ARM sa11x0 mcp bus needed to be converted to that too.
Diffstat (limited to 'drivers/char/i8k.c')
-rw-r--r-- | drivers/char/i8k.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c index 6e40072fbf67..40cc0cf2ded6 100644 --- a/drivers/char/i8k.c +++ b/drivers/char/i8k.c | |||
@@ -69,19 +69,19 @@ MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)"); | |||
69 | MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops"); | 69 | MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops"); |
70 | MODULE_LICENSE("GPL"); | 70 | MODULE_LICENSE("GPL"); |
71 | 71 | ||
72 | static int force; | 72 | static bool force; |
73 | module_param(force, bool, 0); | 73 | module_param(force, bool, 0); |
74 | MODULE_PARM_DESC(force, "Force loading without checking for supported models"); | 74 | MODULE_PARM_DESC(force, "Force loading without checking for supported models"); |
75 | 75 | ||
76 | static int ignore_dmi; | 76 | static bool ignore_dmi; |
77 | module_param(ignore_dmi, bool, 0); | 77 | module_param(ignore_dmi, bool, 0); |
78 | MODULE_PARM_DESC(ignore_dmi, "Continue probing hardware even if DMI data does not match"); | 78 | MODULE_PARM_DESC(ignore_dmi, "Continue probing hardware even if DMI data does not match"); |
79 | 79 | ||
80 | static int restricted; | 80 | static bool restricted; |
81 | module_param(restricted, bool, 0); | 81 | module_param(restricted, bool, 0); |
82 | MODULE_PARM_DESC(restricted, "Allow fan control if SYS_ADMIN capability set"); | 82 | MODULE_PARM_DESC(restricted, "Allow fan control if SYS_ADMIN capability set"); |
83 | 83 | ||
84 | static int power_status; | 84 | static bool power_status; |
85 | module_param(power_status, bool, 0600); | 85 | module_param(power_status, bool, 0600); |
86 | MODULE_PARM_DESC(power_status, "Report power status in /proc/i8k"); | 86 | MODULE_PARM_DESC(power_status, "Report power status in /proc/i8k"); |
87 | 87 | ||