summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-06 10:04:58 -0400
committerTom Rini <trini@konsulko.com>2016-06-06 13:37:56 -0400
commitffd859979e2a84bccc14188d9fa760b2e4813515 (patch)
tree276cb26811a0da6696148e3628d4af36c4c721df /common
parent1cb9cb3ec0f19b8c54bb01670a530f5bc210d5f3 (diff)
parent10db7500369ea000af4c4c5b039b7946c2865ae9 (diff)
downloadtalos-obmc-uboot-ffd859979e2a84bccc14188d9fa760b2e4813515.tar.gz
talos-obmc-uboot-ffd859979e2a84bccc14188d9fa760b2e4813515.zip
Merge branch 'master' of git://git.denx.de/u-boot-usb
Modified: configs/ls1012afrdm_qspi_defconfig configs/ls1012aqds_qspi_defconfig configs/ls1012ardb_qspi_defconfig include/configs/ls1012afrdm.h include/configs/ls1012aqds.h include/configs/ls1012ardb.h Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
-rw-r--r--common/usb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/usb.c b/common/usb.c
index 8d9efe516b..b3ba487890 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -1182,7 +1182,7 @@ int usb_new_device(struct usb_device *dev)
* with the device. So a get_descriptor will fail before any
* of that is done for XHCI unlike EHCI.
*/
-#ifdef CONFIG_USB_XHCI
+#ifdef CONFIG_USB_XHCI_HCD
do_read = false;
#endif
err = usb_setup_device(dev, do_read, dev->parent);
OpenPOWER on IntegriCloud