Removed obsolete comment from alps.patch and updated the

patch for kernel 2.6.5.

1 files changed, 19 insertions, 26 deletions

diff --git a/alps.patch b/alps.patch
index 587934a..bfb4f7f 100644
--- a/alps.patch
+++ b/alps.patch
@@ -51,25 +51,25 @@ initial announcement have not been dealt with:
 
 
  linux-petero/drivers/input/mouse/Makefile       |    2 
- linux-petero/drivers/input/mouse/alps.c         |  144 ++++++++++++++++++++++++
+ linux-petero/drivers/input/mouse/alps.c         |  137 ++++++++++++++++++++++++
  linux-petero/drivers/input/mouse/alps.h         |   17 ++
  linux-petero/drivers/input/mouse/psmouse-base.c |    8 +
  linux-petero/drivers/input/mouse/psmouse.h      |    1 
- 5 files changed, 171 insertions(+), 1 deletion(-)
+ 5 files changed, 164 insertions(+), 1 deletion(-)
 
 diff -puN drivers/input/mouse/Makefile~alps drivers/input/mouse/Makefile
---- linux/drivers/input/mouse/Makefile~alps	2004-02-22 08:29:18.000000000 +0100
-+++ linux-petero/drivers/input/mouse/Makefile	2004-02-22 08:29:18.000000000 +0100
-@@ -14,4 +14,4 @@ obj-$(CONFIG_MOUSE_PC9800)	+= 98busmouse
- obj-$(CONFIG_MOUSE_PS2)		+= psmouse.o
+--- linux/drivers/input/mouse/Makefile~alps	2004-04-22 23:33:12.000000000 +0200
++++ linux-petero/drivers/input/mouse/Makefile	2004-04-22 23:33:12.000000000 +0200
+@@ -15,4 +15,4 @@ obj-$(CONFIG_MOUSE_PS2)		+= psmouse.o
  obj-$(CONFIG_MOUSE_SERIAL)	+= sermouse.o
+ obj-$(CONFIG_MOUSE_VSXXXAA)	+= vsxxxaa.o
  
 -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	2004-02-22 08:29:18.000000000 +0100
-+++ linux-petero/drivers/input/mouse/alps.c	2004-02-28 20:42:41.000000000 +0100
-@@ -0,0 +1,144 @@
+diff -puN /dev/null drivers/input/mouse/alps.c
+--- /dev/null	2003-01-30 11:24:37.000000000 +0100
++++ linux-petero/drivers/input/mouse/alps.c	2004-04-22 23:34:00.000000000 +0200
+@@ -0,0 +1,137 @@
 +/*
 + * ALPS touchpad PS/2 mouse driver
 + *
@@ -133,13 +133,6 @@ diff -puN drivers/input/mouse/alps.c~alps drivers/input/mouse/alps.c
 + * On a dualpoint, {mid,rig,lef}0 are the stick, 1 are the pad.
 + * We just 'or' them together for now.
 + *
-+ * We used to send 'ges'tures as BTN_TOUCH but this made it impossible
-+ * to disable tap events in the synaptics driver since the driver
-+ * was unable to distinguish a gesture tap from an actual button click.
-+ * A tap gesture now creates an emulated touch that the synaptics
-+ * driver can interpret as a tap event, if MaxTapTime=0 and
-+ * MaxTapMove=0 then the driver will ignore taps.
-+ *
 + * The touchpad on an 'Acer Aspire' has 4 buttons:
 + *   left,right,up,down.
 + * This device always sets {mid,rig,lef}0 to 1 and
@@ -214,9 +207,9 @@ 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	2004-02-22 08:29:18.000000000 +0100
-+++ linux-petero/drivers/input/mouse/alps.h	2004-02-22 08:29:18.000000000 +0100
+diff -puN /dev/null drivers/input/mouse/alps.h
+--- /dev/null	2003-01-30 11:24:37.000000000 +0100
++++ linux-petero/drivers/input/mouse/alps.h	2004-04-22 23:33:12.000000000 +0200
 @@ -0,0 +1,17 @@
 +/*
 + * ALPS touchpad PS/2 mouse driver
@@ -236,8 +229,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	2004-02-22 08:29:18.000000000 +0100
-+++ linux-petero/drivers/input/mouse/psmouse-base.c	2004-02-22 08:29:18.000000000 +0100
+--- linux/drivers/input/mouse/psmouse-base.c~alps	2004-04-22 23:33:12.000000000 +0200
++++ linux-petero/drivers/input/mouse/psmouse-base.c	2004-04-22 23:33:12.000000000 +0200
 @@ -21,6 +21,7 @@
  #include "psmouse.h"
  #include "synaptics.h"
@@ -246,7 +239,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");
-@@ -196,6 +197,10 @@ static irqreturn_t psmouse_interrupt(str
+@@ -202,6 +203,10 @@ static irqreturn_t psmouse_interrupt(str
  		goto out;
  	}
  
@@ -257,7 +250,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;
-@@ -513,6 +518,9 @@ static void psmouse_initialize(struct ps
+@@ -542,6 +547,9 @@ static void psmouse_initialize(struct ps
   */
  
  	psmouse_command(psmouse, param, PSMOUSE_CMD_SETSTREAM);
@@ -268,8 +261,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	2004-02-22 08:29:18.000000000 +0100
-+++ linux-petero/drivers/input/mouse/psmouse.h	2004-02-22 08:29:18.000000000 +0100
+--- linux/drivers/input/mouse/psmouse.h~alps	2004-04-22 23:33:12.000000000 +0200
++++ linux-petero/drivers/input/mouse/psmouse.h	2004-04-22 23:33:12.000000000 +0200
 @@ -9,6 +9,7 @@
  #define PSMOUSE_CMD_GETID	0x02f2
  #define PSMOUSE_CMD_SETRATE	0x10f3