diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-13 21:41:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-13 21:41:14 -0800 |
| commit | a30b7ca2894994e4e2f2e06811ee67fa637bca2e (patch) | |
| tree | 515cb6e1fea6da4671d526ad753ce5584ca2fe6e /drivers/input/serio | |
| parent | d83763f4a6adb2f417c3288ee903982985ae949c (diff) | |
| parent | bbdb5c22e12507e7f1637091bc24fe4d33e128e5 (diff) | |
| download | linux-a30b7ca2894994e4e2f2e06811ee67fa637bca2e.tar.gz linux-a30b7ca2894994e4e2f2e06811ee67fa637bca2e.tar.bz2 linux-a30b7ca2894994e4e2f2e06811ee67fa637bca2e.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull more input updates from Dmitry Torokhov:
"An update to the tsc2005 driver that allows it to also support tsc2004
(basically the same controller, but uses i2c instead of spi bus), and
a couple of bug fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: parkbd - drop bogus __init from parkbd_allocate_serio()
Input: elantech - add Fujitsu Lifebook U745 to force crc_enabled
Input: tsc2004 - add support for tsc2004
Input: tsc200x-core - rename functions and variables
Input: tsc2005 - separate SPI and core functions
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; |