From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932629Ab0CaARs (ORCPT ); Tue, 30 Mar 2010 20:17:48 -0400 Received: from kroah.org ([198.145.64.141]:51740 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756638Ab0C3XR3 (ORCPT ); Tue, 30 Mar 2010 19:17:29 -0400 X-Mailbox-Line: From linux@linux.site Tue Mar 30 15:56:03 2010 Message-Id: <20100330225603.125225531@linux.site> User-Agent: quilt/0.47-14.9 Date: Tue, 30 Mar 2010 15:54:49 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, =?ISO-8859-15?q?Thomas=20B=C3=A4chler?= , Dmitry Torokhov , Greg Kroah-Hartman Subject: [011/116] Input: alps - add support for the touchpad on Toshiba Tecra A11-11L In-Reply-To: <20100330230600.GA28802@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.32-stable review patch. If anyone has any objections, please let us know. ------------------ From: Thomas Bächler commit eb8bff85c5bd5caef7c374ff32b86545029efb56 upstream. Signed-off-by: Thomas Bächler Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/mouse/alps.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -62,6 +62,8 @@ static const struct alps_model_info alps { { 0x62, 0x02, 0x14 }, 0xcf, 0xcf, ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, { { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FW_BK_1 }, /* Dell Vostro 1400 */ + { { 0x52, 0x01, 0x14 }, 0xff, 0xff, + ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, /* Toshiba Tecra A11-11L */ }; /*