From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Nov 2015 05:41:14 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v4.4-rc1~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a30b7ca2894994e4e2f2e06811ee67fa637bca2e;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

Merge branch 'for-linus' of git://git./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
---

a30b7ca2894994e4e2f2e06811ee67fa637bca2e
diff --cc drivers/input/touchscreen/tsc2005.c
index f41f233,1bbe64c..b9f593d
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@@ -750,9 -75,8 +75,7 @@@ static int tsc2005_remove(struct spi_de
  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,