git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'egalax' into for-linus
[pandora-kernel.git]
/
drivers
/
hid
/
usbhid
/
usbkbd.c
diff --git
a/drivers/hid/usbhid/usbkbd.c
b/drivers/hid/usbhid/usbkbd.c
index
f843443
..
b2fd0b0
100644
(file)
--- a/
drivers/hid/usbhid/usbkbd.c
+++ b/
drivers/hid/usbhid/usbkbd.c
@@
-313,6
+313,7
@@
static int usb_kbd_probe(struct usb_interface *iface,
goto fail2;
usb_set_intfdata(iface, kbd);
goto fail2;
usb_set_intfdata(iface, kbd);
+ device_set_wakeup_enable(&dev->dev, 1);
return 0;
fail2:
return 0;
fail2: