commit fa629ef5222193214da9a2b3c94369f79353bec9
author Seth Forshee <seth.forshee@canonical.com> Mon Nov 07 19:53:24 2011 -0800
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> Mon Nov 07 22:22:10 2011 -0800
tree 07221f6fa39181d1bfb8bf51ff4cb86c8e36a6d3
parent d4b347b29b4d14647c7394f7167bf6785dc98e50

Input: ALPS - add protocol version field in alps_model_info

In preparation for adding support for more ALPS protocol versions,
add a field for the protocol version to the model info instead of
using a field in the flags. OLDPROTO and !OLDPROTO are now called
version 1 and version 2, repsectively.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

drivers/input/mouse/alps.h

diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
index 904ed8b..4ce9bba 100644
--- a/drivers/input/mouse/alps.h
+++ b/drivers/input/mouse/alps.h
@@ -12,8 +12,12 @@
 #ifndef _ALPS_H
 #define _ALPS_H
 
+#define ALPS_PROTO_V1	0
+#define ALPS_PROTO_V2	1
+
 struct alps_model_info {
         unsigned char signature[3];
+	unsigned char proto_version;
         unsigned char byte0, mask0;
         unsigned char flags;
 };