diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-13 11:56:45 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-13 11:56:45 -0800 |
| commit | bbdb5c22e12507e7f1637091bc24fe4d33e128e5 (patch) | |
| tree | b66d1f87c6659d6875b5b0bd6b71cbfe3bbe2285 /drivers/input/serio | |
| parent | e60e063c14b13d0f66ffc708b8aa5d1a8208606e (diff) | |
| parent | 5e0baca8b3247f459af50947eaafc68bb8168b33 (diff) | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.3 merge window.
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/parkbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/parkbd.c b/drivers/input/serio/parkbd.c index 74bb17270255..92c31b8f8fb4 100644 --- a/drivers/input/serio/parkbd.c +++ b/drivers/input/serio/parkbd.c @@ -164,7 +164,7 @@ static int parkbd_getport(struct parport *pp) return 0; } -static struct serio * __init parkbd_allocate_serio(void) +static struct serio *parkbd_allocate_serio(void) { struct serio *serio; |