diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-29 10:25:13 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-29 10:25:13 +1000 |
commit | 4ced8844a6322db59ae2e16df9c05b59e6135293 (patch) | |
tree | 70149a97757617b9940a3592dded6d2ddc2c8bf8 /arch | |
parent | 86d6938b5b747e153fb4b62321819d2d0ee7bcf6 (diff) | |
parent | 8fd708157a592a376c4d0b3b2ba23b9e9f79caa5 (diff) |
Merge remote-tracking branch 'input/next'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 6d612792f6b8..1faf6cb93dcb 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -24,7 +24,7 @@ #include <linux/usb/r8a66597.h> #include <linux/usb/renesas_usbhs.h> #include <linux/i2c.h> -#include <linux/i2c/tsc2007.h> +#include <linux/platform_data/tsc2007.h> #include <linux/spi/spi.h> #include <linux/spi/sh_msiof.h> #include <linux/spi/mmc_spi.h> |