diff options
| author | Peter Osterlund <petero2@telia.com> | 2003-11-12 16:52:01 +0100 |
|---|---|---|
| committer | Peter Osterlund <petero2@telia.com> | 2006-04-09 04:01:22 +0200 |
| commit | efbbea912111d1072b472cc1e38c57203a8059cd (patch) | |
| tree | aa2dcabee04405336ec80bf77a7fe7ac2d3dbf9f /alps.patch | |
| parent | c04c5744c3fdaff2037b7eb387640888c09d8b1a (diff) | |
Rediffed the alps patch for kernel 2.6.0-test9-bk16.
Diffstat (limited to 'alps.patch')
| -rw-r--r-- | alps.patch | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -58,8 +58,8 @@ initial announcement have not been dealt with: 5 files changed, 157 insertions(+), 1 deletion(-) diff -puN drivers/input/mouse/Makefile~alps drivers/input/mouse/Makefile ---- linux/drivers/input/mouse/Makefile~alps 2003-10-26 08:33:30.000000000 +0100 -+++ linux-petero/drivers/input/mouse/Makefile 2003-10-26 08:35:34.000000000 +0100 +--- linux/drivers/input/mouse/Makefile~alps 2003-11-12 16:18:59.000000000 +0100 ++++ linux-petero/drivers/input/mouse/Makefile 2003-11-12 16:18:59.000000000 +0100 @@ -14,4 +14,4 @@ obj-$(CONFIG_MOUSE_PC9800) += 98busmouse obj-$(CONFIG_MOUSE_PS2) += psmouse.o obj-$(CONFIG_MOUSE_SERIAL) += sermouse.o @@ -67,8 +67,8 @@ diff -puN drivers/input/mouse/Makefile~alps drivers/input/mouse/Makefile -psmouse-objs := psmouse-base.o logips2pp.o synaptics.o +psmouse-objs := psmouse-base.o logips2pp.o alps.o synaptics.o diff -puN drivers/input/mouse/alps.c~alps drivers/input/mouse/alps.c ---- linux/drivers/input/mouse/alps.c~alps 2003-10-26 08:33:30.000000000 +0100 -+++ linux-petero/drivers/input/mouse/alps.c 2003-10-26 08:33:30.000000000 +0100 +--- linux/drivers/input/mouse/alps.c~alps 2003-11-12 16:18:59.000000000 +0100 ++++ linux-petero/drivers/input/mouse/alps.c 2003-11-12 16:18:59.000000000 +0100 @@ -0,0 +1,131 @@ +/* + * ALPS touchpad PS/2 mouse driver @@ -202,8 +202,8 @@ diff -puN drivers/input/mouse/alps.c~alps drivers/input/mouse/alps.c + return 0; +} diff -puN drivers/input/mouse/alps.h~alps drivers/input/mouse/alps.h ---- linux/drivers/input/mouse/alps.h~alps 2003-10-26 08:33:30.000000000 +0100 -+++ linux-petero/drivers/input/mouse/alps.h 2003-10-26 08:33:30.000000000 +0100 +--- linux/drivers/input/mouse/alps.h~alps 2003-11-12 16:18:59.000000000 +0100 ++++ linux-petero/drivers/input/mouse/alps.h 2003-11-12 16:18:59.000000000 +0100 @@ -0,0 +1,17 @@ +/* + * ALPS touchpad PS/2 mouse driver @@ -223,8 +223,8 @@ diff -puN drivers/input/mouse/alps.h~alps drivers/input/mouse/alps.h +int ALPS_process_byte(struct psmouse *psmouse, struct pt_regs *regs); +#endif diff -puN drivers/input/mouse/psmouse-base.c~alps drivers/input/mouse/psmouse-base.c ---- linux/drivers/input/mouse/psmouse-base.c~alps 2003-10-26 08:33:30.000000000 +0100 -+++ linux-petero/drivers/input/mouse/psmouse-base.c 2003-10-26 08:35:34.000000000 +0100 +--- linux/drivers/input/mouse/psmouse-base.c~alps 2003-11-12 16:18:59.000000000 +0100 ++++ linux-petero/drivers/input/mouse/psmouse-base.c 2003-11-12 16:18:59.000000000 +0100 @@ -21,6 +21,7 @@ #include "psmouse.h" #include "synaptics.h" @@ -233,7 +233,7 @@ diff -puN drivers/input/mouse/psmouse-base.c~alps drivers/input/mouse/psmouse-ba MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>"); MODULE_DESCRIPTION("PS/2 mouse driver"); -@@ -179,6 +180,9 @@ static irqreturn_t psmouse_interrupt(str +@@ -177,6 +178,9 @@ static irqreturn_t psmouse_interrupt(str goto out; } @@ -243,7 +243,7 @@ diff -puN drivers/input/mouse/psmouse-base.c~alps drivers/input/mouse/psmouse-ba if (psmouse->pktcnt == 3 + (psmouse->type >= PSMOUSE_GENPS)) { psmouse_process_packet(psmouse, regs); psmouse->pktcnt = 0; -@@ -485,6 +489,9 @@ static void psmouse_initialize(struct ps +@@ -479,6 +483,9 @@ static void psmouse_initialize(struct ps */ psmouse_command(psmouse, param, PSMOUSE_CMD_SETSTREAM); @@ -254,8 +254,8 @@ diff -puN drivers/input/mouse/psmouse-base.c~alps drivers/input/mouse/psmouse-ba /* diff -puN drivers/input/mouse/psmouse.h~alps drivers/input/mouse/psmouse.h ---- linux/drivers/input/mouse/psmouse.h~alps 2003-10-26 08:33:30.000000000 +0100 -+++ linux-petero/drivers/input/mouse/psmouse.h 2003-10-26 08:35:34.000000000 +0100 +--- linux/drivers/input/mouse/psmouse.h~alps 2003-11-12 16:18:59.000000000 +0100 ++++ linux-petero/drivers/input/mouse/psmouse.h 2003-11-12 16:18:59.000000000 +0100 @@ -9,6 +9,7 @@ #define PSMOUSE_CMD_GETID 0x02f2 #define PSMOUSE_CMD_SETRATE 0x10f3 |