diff options
| author | Peter Osterlund <petero2@telia.com> | 2004-09-02 21:04:19 +0200 |
|---|---|---|
| committer | Peter Osterlund <petero2@telia.com> | 2006-04-09 04:02:50 +0200 |
| commit | 911a308556077b2a794918d23dc5051e1b4e1b2d (patch) | |
| tree | c832fa50dbc1c60b347934e0c9e55e6d469e4578 | |
| parent | 310638391b74fe552d3b75bb5997aa44c2caee8b (diff) | |
Updated the alps patch to make it work on the DELL Inspiron
8600. From Alexandre Belloni <abelloni@nerim.net>.
| -rw-r--r-- | alps.patch | 23 |
1 files changed, 12 insertions, 11 deletions
@@ -17,15 +17,15 @@ features: --- linux-petero/drivers/input/mouse/Makefile | 2 - linux-petero/drivers/input/mouse/alps.c | 422 ++++++++++++++++++++++++ + linux-petero/drivers/input/mouse/alps.c | 423 ++++++++++++++++++++++++ linux-petero/drivers/input/mouse/alps.h | 17 linux-petero/drivers/input/mouse/psmouse-base.c | 24 + linux-petero/drivers/input/mouse/psmouse.h | 4 - 5 files changed, 467 insertions(+), 2 deletions(-) + 5 files changed, 468 insertions(+), 2 deletions(-) diff -puN drivers/input/mouse/Makefile~alps drivers/input/mouse/Makefile ---- linux/drivers/input/mouse/Makefile~alps 2004-07-31 11:24:04.000000000 +0200 -+++ linux-petero/drivers/input/mouse/Makefile 2004-07-31 11:24:04.000000000 +0200 +--- linux/drivers/input/mouse/Makefile~alps 2004-08-22 20:05:54.000000000 +0200 ++++ linux-petero/drivers/input/mouse/Makefile 2004-08-22 20:05:54.000000000 +0200 @@ -14,4 +14,4 @@ obj-$(CONFIG_MOUSE_PS2) += psmouse.o obj-$(CONFIG_MOUSE_SERIAL) += sermouse.o obj-$(CONFIG_MOUSE_VSXXXAA) += vsxxxaa.o @@ -34,8 +34,8 @@ diff -puN drivers/input/mouse/Makefile~alps drivers/input/mouse/Makefile +psmouse-objs := psmouse-base.o alps.o logips2pp.o synaptics.o diff -puN /dev/null drivers/input/mouse/alps.c --- /dev/null 2004-02-23 22:02:56.000000000 +0100 -+++ linux-petero/drivers/input/mouse/alps.c 2004-07-31 15:55:30.082455504 +0200 -@@ -0,0 +1,422 @@ ++++ linux-petero/drivers/input/mouse/alps.c 2004-09-02 21:00:12.456441432 +0200 +@@ -0,0 +1,423 @@ +/* + * ALPS touchpad PS/2 mouse driver + * @@ -82,6 +82,7 @@ diff -puN /dev/null drivers/input/mouse/alps.c + { { 0x63, 0x02, 0x3c }, ALPS_MODEL_GLIDEPOINT }, + { { 0x63, 0x02, 0x50 }, ALPS_MODEL_GLIDEPOINT }, + { { 0x63, 0x02, 0x64 }, ALPS_MODEL_GLIDEPOINT }, ++ { { 0x63, 0x03, 0xc8 }, ALPS_MODEL_DUALPOINT }, + { { 0x20, 0x02, 0x0e }, ALPS_MODEL_DUALPOINT }, + { { 0x22, 0x02, 0x0a }, ALPS_MODEL_DUALPOINT }, + { { 0x22, 0x02, 0x14 }, ALPS_MODEL_DUALPOINT }, @@ -460,7 +461,7 @@ diff -puN /dev/null drivers/input/mouse/alps.c + diff -puN /dev/null drivers/input/mouse/alps.h --- /dev/null 2004-02-23 22:02:56.000000000 +0100 -+++ linux-petero/drivers/input/mouse/alps.h 2004-07-31 11:24:04.000000000 +0200 ++++ linux-petero/drivers/input/mouse/alps.h 2004-08-22 20:05:54.000000000 +0200 @@ -0,0 +1,17 @@ +/* + * ALPS touchpad PS/2 mouse driver @@ -480,8 +481,8 @@ diff -puN /dev/null drivers/input/mouse/alps.h + +#endif diff -puN drivers/input/mouse/psmouse-base.c~alps drivers/input/mouse/psmouse-base.c ---- linux/drivers/input/mouse/psmouse-base.c~alps 2004-07-31 11:24:04.000000000 +0200 -+++ linux-petero/drivers/input/mouse/psmouse-base.c 2004-07-31 11:24:04.000000000 +0200 +--- linux/drivers/input/mouse/psmouse-base.c~alps 2004-08-22 20:05:54.000000000 +0200 ++++ linux-petero/drivers/input/mouse/psmouse-base.c 2004-08-22 20:05:54.000000000 +0200 @@ -2,6 +2,7 @@ * PS/2 mouse driver * @@ -535,8 +536,8 @@ diff -puN drivers/input/mouse/psmouse-base.c~alps drivers/input/mouse/psmouse-ba if (set_properties) { diff -puN drivers/input/mouse/psmouse.h~alps drivers/input/mouse/psmouse.h ---- linux/drivers/input/mouse/psmouse.h~alps 2004-07-31 11:24:04.000000000 +0200 -+++ linux-petero/drivers/input/mouse/psmouse.h 2004-07-31 11:24:04.000000000 +0200 +--- linux/drivers/input/mouse/psmouse.h~alps 2004-08-22 20:05:54.000000000 +0200 ++++ linux-petero/drivers/input/mouse/psmouse.h 2004-08-22 20:05:54.000000000 +0200 @@ -2,13 +2,16 @@ #define _PSMOUSE_H |