author | Linus Torvalds <torvalds@linux-foundation.org> | |
Sat, 14 Nov 2015 05:41:14 +0000 (21:41 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Sat, 14 Nov 2015 05:41:14 +0000 (21:41 -0800) |
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
"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
1 | 2 | |||
---|---|---|---|---|
drivers/input/touchscreen/tsc2005.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/input/touchscreen/tsc2005.c
index f41f23318484d1fb97a427b38e28f15c6e585f57,1bbe64c89a10e6cfcc845bb472fed785acebab7d..b9f593dfd2ef8368223e5d7d7d9ca06856afcc8d
static struct spi_driver tsc2005_driver = {
.driver = {
.name = "tsc2005",
- .pm = &tsc2005_pm_ops,
- .owner = THIS_MODULE,
+ .pm = &tsc200x_pm_ops,
},
.probe = tsc2005_probe,
.remove = tsc2005_remove,