diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-08 21:39:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-08 21:39:37 +0200 |
| commit | 43d012099f5479eb057145f273280ff097f0e73d (patch) | |
| tree | 516ac56985a77bf68fd06f549eeb2bdfa1543d7d /drivers/mfd | |
| parent | Merge tag 'dmaengine-4.13-rc1' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| parent | Merge branch 'next' into for-linus (diff) | |
| download | linux-43d012099f5479eb057145f273280ff097f0e73d.tar.xz linux-43d012099f5479eb057145f273280ff097f0e73d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
- a new driver for STM FingerTip touchscreen
- a new driver for D-Link DIR-685 touch keys
- updated list of supported devices in xpad driver
- other assorted updates and fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (23 commits)
MAINTAINERS: update input subsystem patterns
Input: introduce KEY_ASSISTANT
Input: xpad - sync supported devices with XBCD
Input: xpad - sync supported devices with 360Controller
Input: xen-kbdfront - use string constants from PV protocol
Input: stmfts - mark all PM functions as __maybe_unused
Input: add support for the STMicroelectronics FingerTip touchscreen
Input: add D-Link DIR-685 touchkeys driver
Input: s3c2410_ts - handle return value of clk_prepare_enable
Input: axp20x-pek - add wakeup support
Input: synaptics-rmi4 - use %phN to form F34 configuration ID
Input: synaptics-rmi4 - change a char type to u8
Input: sparse-keymap - remove sparse_keymap_free()
Input: tsc2007 - move header file out of I2C realm
Input: mms114 - move header file out of I2C realm
Input: mcs - move header file out of I2C realm
Input: lm8323 - move header file out of I2C realm
Input: elantech - force relative mode on a certain module
Input: elan_i2c - add support for fetching chip type on newer hardware
Input: elan_i2c - check if device is there before really probing
...
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/timberdale.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c index c9339f85359b..cd4a6d7d6750 100644 --- a/drivers/mfd/timberdale.c +++ b/drivers/mfd/timberdale.c @@ -32,13 +32,13 @@ #include <linux/i2c.h> #include <linux/i2c-ocores.h> #include <linux/i2c-xiic.h> -#include <linux/i2c/tsc2007.h> #include <linux/spi/spi.h> #include <linux/spi/xilinx_spi.h> #include <linux/spi/max7301.h> #include <linux/spi/mc33880.h> +#include <linux/platform_data/tsc2007.h> #include <linux/platform_data/media/timb_radio.h> #include <linux/platform_data/media/timb_video.h> |