[PATCH] ALPS: do not activate on unsupported models

It feels like 2.6.11 is right around the corner.  I would like to disable
ALPS suport for some devices we don't know how to handle properly yet to
cut down on number of complaints that we broke mouse support.

Input: ALPS - do not activate native mode for devices whose data
       we can not handle yet.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 883e0c678263bcdaad4b6815e49b10374efb08c5..e8c0b61e3ad6bc57f45fd819bea26108f5e1457f 100644 (file)
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -34,7 +34,7 @@ struct alps_model_info {
        unsigned char signature[3];
        unsigned char model;
 } alps_model_data[] = {
-       { { 0x33, 0x02, 0x0a }, ALPS_MODEL_GLIDEPOINT },
+/*     { { 0x33, 0x02, 0x0a }, ALPS_MODEL_GLIDEPOINT },        */
        { { 0x53, 0x02, 0x0a }, ALPS_MODEL_GLIDEPOINT },
        { { 0x53, 0x02, 0x14 }, ALPS_MODEL_GLIDEPOINT },
        { { 0x63, 0x02, 0x0a }, ALPS_MODEL_GLIDEPOINT },
@@ -42,8 +42,8 @@ struct alps_model_info {
        { { 0x73, 0x02, 0x0a }, ALPS_MODEL_GLIDEPOINT },
        { { 0x73, 0x02, 0x14 }, ALPS_MODEL_GLIDEPOINT },
        { { 0x63, 0x02, 0x28 }, ALPS_MODEL_GLIDEPOINT },
-       { { 0x63, 0x02, 0x3c }, ALPS_MODEL_GLIDEPOINT },
-       { { 0x63, 0x02, 0x50 }, ALPS_MODEL_GLIDEPOINT },
+/*     { { 0x63, 0x02, 0x3c }, ALPS_MODEL_GLIDEPOINT },        */
+/*     { { 0x63, 0x02, 0x50 }, ALPS_MODEL_GLIDEPOINT },        */
        { { 0x63, 0x02, 0x64 }, ALPS_MODEL_GLIDEPOINT },
        { { 0x20, 0x02, 0x0e }, ALPS_MODEL_DUALPOINT },
        { { 0x22, 0x02, 0x0a }, ALPS_MODEL_DUALPOINT },