Updated the alps patch for kernel 2.6.9.

1 files changed, 17 insertions, 22 deletions

diff --git a/alps.patch b/alps.patch
index b8d560f..b42b819 100644
--- a/alps.patch
+++ b/alps.patch
@@ -20,12 +20,12 @@ features:
  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, 468 insertions(+), 2 deletions(-)
+ linux-petero/drivers/input/mouse/psmouse.h      |    3 
+ 5 files changed, 467 insertions(+), 2 deletions(-)
 
 diff -puN drivers/input/mouse/Makefile~alps drivers/input/mouse/Makefile
---- 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
+--- linux/drivers/input/mouse/Makefile~alps	2004-10-20 20:04:38.188738232 +0200
++++ linux-petero/drivers/input/mouse/Makefile	2004-10-20 20:04:38.194737320 +0200
 @@ -14,4 +14,4 @@ obj-$(CONFIG_MOUSE_PS2)		+= psmouse.o
  obj-$(CONFIG_MOUSE_SERIAL)	+= sermouse.o
  obj-$(CONFIG_MOUSE_VSXXXAA)	+= vsxxxaa.o
@@ -34,7 +34,7 @@ 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-09-02 21:00:12.456441432 +0200
++++ linux-petero/drivers/input/mouse/alps.c	2004-10-20 20:04:38.195737168 +0200
 @@ -0,0 +1,423 @@
 +/*
 + * ALPS touchpad PS/2 mouse driver
@@ -82,7 +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 },
++	{ { 0x63, 0x03, 0xc8 },	ALPS_MODEL_DUALPOINT },
 +	{ { 0x20, 0x02, 0x0e },	ALPS_MODEL_DUALPOINT },
 +	{ { 0x22, 0x02, 0x0a },	ALPS_MODEL_DUALPOINT },
 +	{ { 0x22, 0x02, 0x14 }, ALPS_MODEL_DUALPOINT },
@@ -461,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-08-22 20:05:54.000000000 +0200
++++ linux-petero/drivers/input/mouse/alps.h	2004-10-20 20:04:38.195737168 +0200
 @@ -0,0 +1,17 @@
 +/*
 + * ALPS touchpad PS/2 mouse driver
@@ -481,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-08-22 20:05:54.000000000 +0200
-+++ linux-petero/drivers/input/mouse/psmouse-base.c	2004-08-22 20:05:54.000000000 +0200
+--- linux/drivers/input/mouse/psmouse-base.c~alps	2004-10-20 20:04:38.190737928 +0200
++++ linux-petero/drivers/input/mouse/psmouse-base.c	2004-10-20 20:04:38.196737016 +0200
 @@ -2,6 +2,7 @@
   * PS/2 mouse driver
   *
@@ -497,9 +497,9 @@ diff -puN drivers/input/mouse/psmouse-base.c~alps drivers/input/mouse/psmouse-ba
  #include "logips2pp.h"
 +#include "alps.h"
  
- MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
- MODULE_DESCRIPTION("PS/2 mouse driver");
-@@ -53,7 +55,7 @@ __obsolete_setup("psmouse_smartscroll=")
+ #define DRIVER_DESC	"PS/2 mouse driver"
+ 
+@@ -55,7 +57,7 @@ __obsolete_setup("psmouse_smartscroll=")
  __obsolete_setup("psmouse_resetafter=");
  __obsolete_setup("psmouse_rate=");
  
@@ -508,7 +508,7 @@ diff -puN drivers/input/mouse/psmouse-base.c~alps drivers/input/mouse/psmouse-ba
  
  /*
   * psmouse_process_byte() analyzes the PS/2 data stream and reports
-@@ -442,6 +444,26 @@ static int psmouse_extensions(struct psm
+@@ -494,6 +496,26 @@ static int psmouse_extensions(struct psm
  		synaptics_reset(psmouse);
  	}
  
@@ -536,9 +536,9 @@ 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-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 @@
+--- linux/drivers/input/mouse/psmouse.h~alps	2004-10-20 20:04:38.191737776 +0200
++++ linux-petero/drivers/input/mouse/psmouse.h	2004-10-20 20:04:38.196737016 +0200
+@@ -2,9 +2,11 @@
  #define _PSMOUSE_H
  
  #define PSMOUSE_CMD_SETSCALE11	0x00e6
@@ -550,12 +550,7 @@ diff -puN drivers/input/mouse/psmouse.h~alps drivers/input/mouse/psmouse.h
  #define PSMOUSE_CMD_POLL	0x03eb
  #define PSMOUSE_CMD_GETID	0x02f2
  #define PSMOUSE_CMD_SETRATE	0x10f3
- #define PSMOUSE_CMD_ENABLE	0x00f4
-+#define PSMOUSE_CMD_DISABLE	0x00f5
- #define PSMOUSE_CMD_RESET_DIS	0x00f6
- #define PSMOUSE_CMD_RESET_BAT	0x02ff
- 
-@@ -72,6 +75,7 @@ struct psmouse {
+@@ -76,6 +78,7 @@ struct psmouse {
  #define PSMOUSE_IMPS		5
  #define PSMOUSE_IMEX		6
  #define PSMOUSE_SYNAPTICS 	7