diff options
| author | Linus Torvalds | 2006-01-07 20:29:51 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-01-07 20:29:51 +0100 |
| commit | b9abaa3fb7328851bdeaad19e694048f0ff71d9a (patch) | |
| tree | de56cda929b837c6b2e421b57c723939ec7df5da /drivers/input/mouse/alps.c | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | Input: ibmasm - convert to dynamic input_dev allocation (diff) | |
| download | kernel-qcow2-linux-b9abaa3fb7328851bdeaad19e694048f0ff71d9a.tar.gz kernel-qcow2-linux-b9abaa3fb7328851bdeaad19e694048f0ff71d9a.tar.xz kernel-qcow2-linux-b9abaa3fb7328851bdeaad19e694048f0ff71d9a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/input/mouse/alps.c')
| -rw-r--r-- | drivers/input/mouse/alps.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 4f41ec3e4332..24474335dfd1 100644 --- a/drivers/input/mouse/alps.c +++ b/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 */ |