diff options
| author |   George G. Davis <ggdavisiv@gmail.com> | 2018-09-28 17:19:34 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-09-28 17:33:54 -0700 |
| commit | d2587800598c119664b22fef55ffa51aeb1da802 (patch) | |
| tree | a460d6face2e754b2d42c71df34e9c1032f5a101 /drivers/input/touchscreen/atmel_mxt_ts.c | |
| parent | Input: sun4i-lradc - convert to using %pOFn instead of device_node.name (diff) | |
| download | linux-dev-d2587800598c119664b22fef55ffa51aeb1da802.tar.xz linux-dev-d2587800598c119664b22fef55ffa51aeb1da802.zip | |
Input: atmel_mxt_ts - fix multiple <linux/property.h> includes
Both v4.16-rc7 commit 93afb1d6e72a ("Input: atmel_mxt_ts - switch from
OF to generic device properties") and v4.16-rc7 commit 96a938aa214e
("Input: atmel_mxt_ts - remove platform data support") added includes of
"<linux/property.h>". Remove one of the duplicate includes to fix this.
Signed-off-by: George G. Davis <george_davis@mentor.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 3232af5dcf89..bbc122f35515 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -29,7 +29,6 @@ #include <linux/property.h> #include <linux/slab.h> #include <linux/gpio/consumer.h> -#include <linux/property.h> #include <asm/unaligned.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> |