Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946029AbbFSVPI (ORCPT ); Fri, 19 Jun 2015 17:15:08 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:51637 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756129AbbFSUjQ (ORCPT ); Fri, 19 Jun 2015 16:39:16 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sam Hung , Dmitry Torokhov Subject: [PATCH 4.0 055/105] Input: elantech - add new icbody type Date: Fri, 19 Jun 2015 13:35:45 -0700 Message-Id: <20150619203559.824032038@linuxfoundation.org> X-Mailer: git-send-email 2.4.4 In-Reply-To: <20150619203558.187802739@linuxfoundation.org> References: <20150619203558.187802739@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 877 Lines: 33 4.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sam Hung commit 692dd1916436164e228608803dfb6cb768d6355a upstream. This adds new icbody type to the list recognized by Elantech PS/2 driver. Signed-off-by: Sam Hung Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/mouse/elantech.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1556,6 +1556,7 @@ static int elantech_set_properties(struc case 9: case 10: case 13: + case 14: etd->hw_version = 4; break; default: -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/