diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-04-14 02:21:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-04-14 02:21:38 -0400 |
| commit | 56f3e1c0579cd06196d51ebd1ccad9298c5426b3 (patch) | |
| tree | cacccdde5f6fb5c9e734977306fb1b73ef33ea03 /drivers/input/serio | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
| parent | 38101475f937c5dc0baf43a9e0c7613dbeb94d5a (diff) | |
Merge branch 'for-linus' into next
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 577688b5b95..6440a8f5568 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c | |||
| @@ -39,7 +39,7 @@ MODULE_PARM_DESC(noaux, "Do not probe or use AUX (mouse) port."); | |||
| 39 | 39 | ||
| 40 | static bool i8042_nomux; | 40 | static bool i8042_nomux; |
| 41 | module_param_named(nomux, i8042_nomux, bool, 0); | 41 | module_param_named(nomux, i8042_nomux, bool, 0); |
| 42 | MODULE_PARM_DESC(nomux, "Do not check whether an active multiplexing conrtoller is present."); | 42 | MODULE_PARM_DESC(nomux, "Do not check whether an active multiplexing controller is present."); |
| 43 | 43 | ||
| 44 | static bool i8042_unlock; | 44 | static bool i8042_unlock; |
| 45 | module_param_named(unlock, i8042_unlock, bool, 0); | 45 | module_param_named(unlock, i8042_unlock, bool, 0); |