diff options
author | Tom Rini <trini@konsulko.com> | 2019-04-21 19:00:04 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-04-21 19:00:04 -0400 |
commit | 6c5f8dd540d7a8eff244d4c27a09451ca12c8d20 (patch) | |
tree | 9eaba554d99f15aa5dfc302c338f59895f9b43e4 /scripts | |
parent | b4fde1633e67bb618fd33aad6e6322b7cecf1154 (diff) | |
parent | 7fd9f31c6bd13609da61b985cf8f5f65ebebd913 (diff) | |
download | u-boot-6c5f8dd540d7a8eff244d4c27a09451ca12c8d20.tar.gz |
Merge branch 'master' of git://git.denx.de/u-boot-usb
- Various fastboot, dwc2/stm32 updates
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/config_whitelist.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5092c3fb4c..421362d953 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4537,7 +4537,6 @@ CONFIG_USB_GADGET_SUPERH CONFIG_USB_INVENTRA_DMA CONFIG_USB_ISP1301_I2C_ADDR CONFIG_USB_MAX_CONTROLLER_COUNT -CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT CONFIG_USB_MUSB_TIMEOUT CONFIG_USB_MUSB_TUSB6010 CONFIG_USB_OHCI_EP93XX |