git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[safe/jmp/linux-2.6]
/
drivers
/
hid
/
usbhid
/
usbkbd.c
diff --git
a/drivers/hid/usbhid/usbkbd.c
b/drivers/hid/usbhid/usbkbd.c
index
bb14c82
..
a948605
100644
(file)
--- a/
drivers/hid/usbhid/usbkbd.c
+++ b/
drivers/hid/usbhid/usbkbd.c
@@
-311,6
+311,7
@@
static int usb_kbd_probe(struct usb_interface *iface,
goto fail2;
usb_set_intfdata(iface, kbd);
+ device_set_wakeup_enable(&dev->dev, 1);
return 0;
fail2: