diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-07-06 22:51:43 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-07-06 22:51:43 +0200 |
| commit | ede2e7cdc58e1847cc73bd26b88a634631a43112 (patch) | |
| tree | f4582f9dc0f4ec8c06975017e036479805d77a4b /drivers/mfd | |
| parent | Input: synaptics-rmi4 - only read the F54 query registers which are used (diff) | |
| parent | MAINTAINERS: update input subsystem patterns (diff) | |
| download | linux-ede2e7cdc58e1847cc73bd26b88a634631a43112.tar.xz linux-ede2e7cdc58e1847cc73bd26b88a634631a43112.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.13 merge window.
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> |