From: George G. Davis <ggdavisiv@gmail.com>
Date: Sat, 29 Sep 2018 00:19:34 +0000 (-0700)
Subject: Input: atmel_mxt_ts - fix multiple <linux/property.h> includes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d2587800598c119664b22fef55ffa51aeb1da802;p=linux.git

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>
---

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 3232af5dcf894..bbc122f35515b 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>