From 93e838732b189eb8eaaf9c93649bc2fc3d0be457 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 21 Dec 2005 00:51:13 -0500 Subject: [PATCH] --- yaml --- r: 16782 b: refs/heads/master c: f5e9c9ca54e31c0f629bae487eadaa5b8515b86d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/alps.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 913229882a24..1a0bfb0ca28b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1e02c9f766e5cf20d951d35e6d2bc2683aa87ef +refs/heads/master: f5e9c9ca54e31c0f629bae487eadaa5b8515b86d diff --git a/trunk/drivers/input/mouse/alps.c b/trunk/drivers/input/mouse/alps.c index 4f41ec3e4332..24474335dfd1 100644 --- a/trunk/drivers/input/mouse/alps.c +++ b/trunk/drivers/input/mouse/alps.c @@ -40,6 +40,7 @@ static struct alps_model_info alps_model_data[] = { { { 0x33, 0x02, 0x0a }, 0x88, 0xf8, ALPS_OLDPROTO }, /* UMAX-530T */ { { 0x53, 0x02, 0x0a }, 0xf8, 0xf8, 0 }, { { 0x53, 0x02, 0x14 }, 0xf8, 0xf8, 0 }, + { { 0x60, 0x03, 0xc8 }, 0xf8, 0xf8, 0 }, /* HP ze1115 */ { { 0x63, 0x02, 0x0a }, 0xf8, 0xf8, 0 }, { { 0x63, 0x02, 0x14 }, 0xf8, 0xf8, 0 }, { { 0x63, 0x02, 0x28 }, 0xf8, 0xf8, ALPS_FW_BK_2 }, /* Fujitsu Siemens S6010 */