diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-21 09:47:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-21 09:47:05 +0200 |
| commit | ac0053fd51d2bac09a7d4b4a59f6dac863bd4373 (patch) | |
| tree | 00c32e14428853f352fa3828d0131653ad6a7c69 /drivers/input/mouse/alps.c | |
| parent | Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Linux 2.6.34-rc5 (diff) | |
| download | linux-ac0053fd51d2bac09a7d4b4a59f6dac863bd4373.tar.xz linux-ac0053fd51d2bac09a7d4b4a59f6dac863bd4373.zip | |
Merge commit 'v2.6.34-rc5' into tracing/core
Merge reason: pick up latest -rc's.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 99d58764ef03..0d22cb9ce42e 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -64,6 +64,7 @@ static const struct alps_model_info alps_model_data[] = { { { 0x62, 0x02, 0x14 }, 0xcf, 0xcf, ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, { { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FOUR_BUTTONS }, /* Dell Vostro 1400 */ + { { 0x73, 0x02, 0x64 }, 0xf8, 0xf8, 0 }, /* HP Pavilion dm3 */ { { 0x52, 0x01, 0x14 }, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, /* Toshiba Tecra A11-11L */ }; |