git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
usb
/
core
/
Kconfig
diff --git
a/drivers/usb/core/Kconfig
b/drivers/usb/core/Kconfig
index 97a819c23ef365a8d52dd63c13d7c94891d5f54d..7e594449600e004c7f6ba14fa2dce39ebee25d20 100644
(file)
--- a/
drivers/usb/core/Kconfig
+++ b/
drivers/usb/core/Kconfig
@@
-109,7
+109,7
@@
config USB_SUSPEND
config USB_OTG
bool
depends on USB && EXPERIMENTAL
-
select
USB_SUSPEND
+
depends on
USB_SUSPEND
default n