Merge branch 'e1000-upstream' of git://198.78.49.142/linux-2.6

[powerpc.git] / drivers / input / keyboard / atkbd.c

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index a0256f8..ffacf6e 100644 (file)
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -321,7 +321,7 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
        switch (code) {
                case ATKBD_RET_BAT:
                        atkbd->enabled = 0;
-                       serio_rescan(atkbd->ps2dev.serio);
+                       serio_reconnect(atkbd->ps2dev.serio);
                        goto out;
                case ATKBD_RET_EMUL0:
                        atkbd->emul = 1;