projects
/
linux-2.6-block.git
/ 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/viro/vfs
[linux-2.6-block.git]
/
drivers
/
usb
/
host
/
sl811-hcd.c
diff --git
a/drivers/usb/host/sl811-hcd.c
b/drivers/usb/host/sl811-hcd.c
index 313d0bbfff29a098dbd87bc5e088f6f7351762b7..ad4483efb6d602cad2a841d8747b5983c16fc33c 100644
(file)
--- a/
drivers/usb/host/sl811-hcd.c
+++ b/
drivers/usb/host/sl811-hcd.c
@@
-1755,7
+1755,7
@@
sl811h_probe(struct platform_device *dev)
/* for this device there's no useful distinction between the controller
* and its root hub, except that the root hub only gets direct PM calls
- * when CONFIG_
USB_SUSPEND
is enabled.
+ * when CONFIG_
PM_RUNTIME
is enabled.
*/
static int