From: Nick Dyer Date: Thu, 11 Sep 2014 17:31:45 +0000 (-0700) Subject: Input: atmel_mxt_ts - fix merge in DT documentation X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=807362cd960daac415e2c8906750b2472c22c80e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Input: atmel_mxt_ts - fix merge in DT documentation Something went a bit wrong in merging f5940231a - there's a bit of repeated text that's been introduced. Signed-off-by: Nick Dyer Signed-off-by: Dmitry Torokhov --- diff --git a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt index 0ac23f2ed104..1852906517ab 100644 --- a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt +++ b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt @@ -11,10 +11,6 @@ Required properties: Optional properties for main touchpad device: -- linux,gpio-keymap: An array of up to 4 entries indicating the Linux - keycode generated by each GPIO. Linux keycodes are defined in - . - - linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages on GPIO bit changes. An array of up to 8 entries can be provided indicating the Linux keycode mapped to each bit of the status byte,