diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-29 19:54:21 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-29 19:54:21 -0700 |
commit | d8f797c60661a90ee26ca9330cf85ede9aa2ec17 (patch) | |
tree | 5038609885fc3e4cb7f329d974875ac4411c6af5 /drivers/input/mouse/logibm.c | |
parent | Input: tsc2007 - move header file out of I2C realm (diff) | |
parent | Linux 4.12-rc3 (diff) | |
download | linux-dev-d8f797c60661a90ee26ca9330cf85ede9aa2ec17.tar.xz linux-dev-d8f797c60661a90ee26ca9330cf85ede9aa2ec17.zip |
Merge tag 'v4.12-rc3' into next
Sync with mainline to bring in changes in platform drovers dropping
calls to sparse_keymap_free() so that we can remove it for good.
Diffstat (limited to 'drivers/input/mouse/logibm.c')
-rw-r--r-- | drivers/input/mouse/logibm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/logibm.c b/drivers/input/mouse/logibm.c index e2413113df22..6f165e053f4d 100644 --- a/drivers/input/mouse/logibm.c +++ b/drivers/input/mouse/logibm.c @@ -69,7 +69,7 @@ MODULE_LICENSE("GPL"); #define LOGIBM_IRQ 5 static int logibm_irq = LOGIBM_IRQ; -module_param_named(irq, logibm_irq, uint, 0); +module_param_hw_named(irq, logibm_irq, uint, irq, 0); MODULE_PARM_DESC(irq, "IRQ number (5=default)"); static struct input_dev *logibm_dev; |