From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Dec 2014 18:06:02 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v3.19-rc1~48
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=d797da41b2aceed5daa8cd2eee92cd74b2a0c652

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input subsystem updates from Dmitry Torokhov:
 "Two new drivers for Elan hardware (for I2C touchpad and touchscreen
  found in several Chromebooks and other devices), a driver for Goodix
  touch panel, and small fixes to Cypress I2C trackpad and other input
  drivers.

  Also we switched to use __maybe_unused instead of gating suspend/
  resume code with #ifdef guards to get better compile coverage"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (27 commits)
  Input: gpio_keys - fix warning regarding uninitialized 'button' variable
  Input: add support for Elan eKTH I2C touchscreens
  Input: gpio_keys - fix warning regarding uninitialized  'irq' variable
  Input: cyapa - use 'error' for error codes
  Input: cyapa - fix resuming the device
  Input: gpio_keys - add device tree support for interrupt only keys
  Input: amikbd - allocate temporary keymap buffer on the stack
  Input: amikbd - fix build if !CONFIG_HW_CONSOLE
  Input: lm8323 - missing error check in lm8323_set_disable()
  Input: initialize device counter variables with -1
  Input: initialize input_no to -1 to avoid subtraction
  Input: i8042 - do not try to load on Intel NUC D54250WYK
  Input: atkbd - correct MSC_SCAN events for force_release keys
  Input: cyapa - switch to using managed resources
  Input: lifebook - use "static inline" instead of "inline" in lifebook.h
  Input: touchscreen - use __maybe_unused instead of ifdef around suspend/resume
  Input: mouse - use __maybe_unused instead of ifdef around suspend/resume
  Input: misc - use __maybe_unused instead of ifdef around suspend/resume
  Input: cap11xx - support for irq-active-high option
  Input: cap11xx - add support for various cap11xx devices
  ...
---

d797da41b2aceed5daa8cd2eee92cd74b2a0c652
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 423d47418e72,e6469ec7a90e..b1df0ad1306c
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -47,8 -42,8 +47,9 @@@ dlink	D-Link Corporatio
  dmo	Data Modul AG
  ebv	EBV Elektronik
  edt	Emerging Display Technologies
+ elan	Elan Microelectronic Corp.
  emmicro	EM Microelectronic
 +energymicro	Silicon Laboratories (formerly Energy Micro AS)
  epcos	EPCOS AG
  epfl	Ecole Polytechnique Fédérale de Lausanne
  epson	Seiko Epson Corp.
diff --cc drivers/input/keyboard/lpc32xx-keys.c
index 8c079371c2e7,9e9786d576cb..265d641c40e2
--- a/drivers/input/keyboard/lpc32xx-keys.c
+++ b/drivers/input/keyboard/lpc32xx-keys.c
@@@ -378,9 -327,9 +327,8 @@@ MODULE_DEVICE_TABLE(of, lpc32xx_kscan_m
  
  static struct platform_driver lpc32xx_kscan_driver = {
  	.probe		= lpc32xx_kscan_probe,
- 	.remove		= lpc32xx_kscan_remove,
  	.driver		= {
  		.name	= DRV_NAME,
 -		.owner	= THIS_MODULE,
  		.pm	= &lpc32xx_kscan_pm_ops,
  		.of_match_table = lpc32xx_kscan_match,
  	}