Automatic merge of /spare/repo/linux-2.6/.git branch HEAD

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 1f85a9718c89..42a9f7f6f8cb 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -341,6 +341,8 @@ static int alps_reconnect(struct psmouse *psmouse)
         unsigned char param[4];
         int version;
 
+        psmouse_reset(psmouse);
+
         if (!(priv->i = alps_get_model(psmouse, &version)))
                 return -1;
 
@@ -395,7 +397,7 @@ int alps_init(struct psmouse *psmouse)
         }
 
         if (param[0] & 0x04) {
-                printk(KERN_INFO "  Enabling hardware tapping\n");
+                printk(KERN_INFO "alps.c: Enabling hardware tapping\n");
                 if (alps_tap_mode(psmouse, 1))
                         printk(KERN_WARNING "alps.c: Failed to enable hardware tapping\n");
         }