diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-03 19:43:51 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-03 19:43:51 -0500 |
| commit | 73eed452b9c9827474c0789c30729dca6fcf061d (patch) | |
| tree | b33a39a41b7b2891b0171f79ea9b5599658884c3 /include/configs/am335x_evm.h | |
| parent | bfb380b30ad2d678c09037560abb6f09a5e9c9b6 (diff) | |
| parent | a2558e8729831e0bcef634ea2440e60425ef0ff6 (diff) | |
| download | u-boot-imx-73eed452b9c9827474c0789c30729dca6fcf061d.zip u-boot-imx-73eed452b9c9827474c0789c30729dca6fcf061d.tar.gz u-boot-imx-73eed452b9c9827474c0789c30729dca6fcf061d.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-dm
Diffstat (limited to 'include/configs/am335x_evm.h')
| -rw-r--r-- | include/configs/am335x_evm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 22caed9..49c14df 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -296,6 +296,7 @@ #ifdef CONFIG_SPL_BUILD #undef CONFIG_DM_MMC #undef CONFIG_TIMER +#undef CONFIG_DM_USB #endif #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) |