diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-20 10:08:17 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-20 10:08:17 -0700 |
| commit | c57d5621d2f2dc238f4b9c4d00b2a54187a75445 (patch) | |
| tree | ece13738a44545fb110e5d73adbf2625bc7a1ea6 /drivers/input/mouse/psmouse-base.c | |
| parent | Input: elan_i2c - enable ELAN0600 acpi panels (diff) | |
| parent | Linux 4.2-rc3 (diff) | |
| download | linux-dev-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.tar.xz linux-dev-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.zip | |
Merge tag 'v4.2-rc3' into next
Sync up with Linux 4.2-rc3 to bring in infrastructure (OF) pieces.
Diffstat (limited to 'drivers/input/mouse/psmouse-base.c')
| -rw-r--r-- | drivers/input/mouse/psmouse-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 7c4ba43d253e..ec3477036150 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -47,7 +47,7 @@ MODULE_LICENSE("GPL"); static unsigned int psmouse_max_proto = PSMOUSE_AUTO; static int psmouse_set_maxproto(const char *val, const struct kernel_param *); static int psmouse_get_maxproto(char *buffer, const struct kernel_param *kp); -static struct kernel_param_ops param_ops_proto_abbrev = { +static const struct kernel_param_ops param_ops_proto_abbrev = { .set = psmouse_set_maxproto, .get = psmouse_get_maxproto, }; |