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/freescale/mpc837xerdb | |
| 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/freescale/mpc837xerdb')
| -rw-r--r-- | board/freescale/mpc837xerdb/mpc837xerdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index 565f815..07c0599 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -210,7 +210,7 @@ int ft_board_setup(void *blob, bd_t *bd) ft_pci_setup(blob, bd); #endif ft_cpu_setup(blob, bd); - fdt_fixup_dr_usb(blob, bd); + fsl_fdt_fixup_dr_usb(blob, bd); fdt_fixup_esdhc(blob, bd); return 0; |