diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-04-26 16:08:27 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 16:08:27 +0900 |
| commit | e19553427c2e8fdb04fdd98e407164bb59a840ba (patch) | |
| tree | 5332234b2dad07c03c27e4608afb16f297f41e61 /drivers/input/mouse/alps.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming/sh-2.6 (diff) | |
| parent | SH: fix error paths in DMA driver (diff) | |
| download | linux-dev-e19553427c2e8fdb04fdd98e407164bb59a840ba.tar.xz linux-dev-e19553427c2e8fdb04fdd98e407164bb59a840ba.zip | |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/kernel/dwarf.c
drivers/dma/shdma.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/input/mouse/alps.c')
| -rw-r--r-- | drivers/input/mouse/alps.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 7490f1da4a53..0d22cb9ce42e 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -15,6 +15,7 @@ * the Free Software Foundation. */ +#include <linux/slab.h> #include <linux/input.h> #include <linux/serio.h> #include <linux/libps2.h> @@ -63,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 */ }; |