From 8b244d71e0a4220654e2c969e90bdc916a2c18d6 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Mon, 8 Mar 2010 23:42:46 -0800 Subject: [PATCH] --- yaml --- r: 188046 b: refs/heads/master c: 3e6e15a862a0bc20128497bbdc54254cdec21835 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/i8042-x86ia64io.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b3dc73a38473..dd01329f123e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58b939959d228681208ba997595411fddc860849 +refs/heads/master: 3e6e15a862a0bc20128497bbdc54254cdec21835 diff --git a/trunk/drivers/input/serio/i8042-x86ia64io.h b/trunk/drivers/input/serio/i8042-x86ia64io.h index 2a5982e532f8..3696cab40598 100644 --- a/trunk/drivers/input/serio/i8042-x86ia64io.h +++ b/trunk/drivers/input/serio/i8042-x86ia64io.h @@ -624,6 +624,9 @@ static int i8042_pnp_kbd_probe(struct pnp_dev *dev, const struct pnp_device_id * strlcat(i8042_pnp_kbd_name, pnp_dev_name(dev), sizeof(i8042_pnp_kbd_name)); } + /* Keyboard ports are always supposed to be wakeup-enabled */ + device_set_wakeup_enable(&dev->dev, true); + i8042_pnp_kbd_devices++; return 0; }