diff options
author | Tom Rini <trini@konsulko.com> | 2016-09-30 21:58:44 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-09-30 21:58:44 -0400 |
commit | fe4ba689a0cb2bb2ceafb88556a57bd80814b648 (patch) | |
tree | 1012656ba1d3e9f8288d69de33c71417b2f22466 /board/Arcturus/ucp1020 | |
parent | f413d1cae89143ad45b066b3d3bc602deafcb50a (diff) | |
parent | 4c043712e9910ef1d612aedbd8304a1f7348ef5f (diff) | |
download | u-boot-imx-fe4ba689a0cb2bb2ceafb88556a57bd80814b648.zip u-boot-imx-fe4ba689a0cb2bb2ceafb88556a57bd80814b648.tar.gz u-boot-imx-fe4ba689a0cb2bb2ceafb88556a57bd80814b648.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/dra7xx_evm.h
Diffstat (limited to 'board/Arcturus/ucp1020')
-rw-r--r-- | board/Arcturus/ucp1020/ucp1020.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c index 0fc2bac..0d086e8 100644 --- a/board/Arcturus/ucp1020/ucp1020.c +++ b/board/Arcturus/ucp1020/ucp1020.c @@ -315,7 +315,7 @@ int ft_board_setup(void *blob, bd_t *bd) FT_FSL_PCI_SETUP; #if defined(CONFIG_HAS_FSL_DR_USB) - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); #endif #if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH) |