diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
| commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
| tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /drivers/usb | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/core/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig index bcc24779ba0e..18d02e32a3d5 100644 --- a/drivers/usb/core/Kconfig +++ b/drivers/usb/core/Kconfig | |||
| @@ -123,9 +123,9 @@ config USB_OTG | |||
| 123 | 123 | ||
| 124 | config USB_OTG_WHITELIST | 124 | config USB_OTG_WHITELIST |
| 125 | bool "Rely on OTG Targeted Peripherals List" | 125 | bool "Rely on OTG Targeted Peripherals List" |
| 126 | depends on USB_OTG || EMBEDDED | 126 | depends on USB_OTG || EXPERT |
| 127 | default y if USB_OTG | 127 | default y if USB_OTG |
| 128 | default n if EMBEDDED | 128 | default n if EXPERT |
| 129 | help | 129 | help |
| 130 | If you say Y here, the "otg_whitelist.h" file will be used as a | 130 | If you say Y here, the "otg_whitelist.h" file will be used as a |
| 131 | product whitelist, so USB peripherals not listed there will be | 131 | product whitelist, so USB peripherals not listed there will be |
| @@ -141,7 +141,7 @@ config USB_OTG_WHITELIST | |||
| 141 | 141 | ||
| 142 | config USB_OTG_BLACKLIST_HUB | 142 | config USB_OTG_BLACKLIST_HUB |
| 143 | bool "Disable external hubs" | 143 | bool "Disable external hubs" |
| 144 | depends on USB_OTG || EMBEDDED | 144 | depends on USB_OTG || EXPERT |
| 145 | help | 145 | help |
| 146 | If you say Y here, then Linux will refuse to enumerate | 146 | If you say Y here, then Linux will refuse to enumerate |
| 147 | external hubs. OTG hosts are allowed to reduce hardware | 147 | external hubs. OTG hosts are allowed to reduce hardware |