diff options
author | Tom Rini <trini@ti.com> | 2013-11-08 15:25:29 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-11-08 15:25:29 -0500 |
commit | 15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f (patch) | |
tree | 662fecd9e66cfe485097f777912824d81f9642e6 /include/configs | |
parent | 28c860b23fb2dd1affec909e98f25c58324e2140 (diff) | |
parent | 47d79deb996797dddd0984cef8b48a566c82180e (diff) | |
download | u-boot-imx-15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f.zip u-boot-imx-15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f.tar.gz u-boot-imx-15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-usb
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/trats.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/trats.h b/include/configs/trats.h index 6ed3313..3d080c4 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -321,9 +321,7 @@ #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 120 * 4) + (1 << 12)) #define CONFIG_CMD_USB_MASS_STORAGE -#if defined(CONFIG_CMD_USB_MASS_STORAGE) #define CONFIG_USB_GADGET_MASS_STORAGE -#endif /* Pass open firmware flat tree */ #define CONFIG_OF_LIBFDT 1 |