diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-28 18:42:10 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-28 18:42:10 -0500 |
| commit | 82d72a1b9967cff4908f22c57536c3660f794401 (patch) | |
| tree | ed7f02df10ffa0f7c4ef87298c1c5e5f4be5dd45 /board/freescale/c29xpcie/c29xpcie.c | |
| parent | 3faf2216d9649e2a22e6728194e9797cb46db933 (diff) | |
| parent | b2b7fbc33ff1b990804e481153dd45de579cff75 (diff) | |
| download | u-boot-imx-82d72a1b9967cff4908f22c57536c3660f794401.zip u-boot-imx-82d72a1b9967cff4908f22c57536c3660f794401.tar.gz u-boot-imx-82d72a1b9967cff4908f22c57536c3660f794401.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'board/freescale/c29xpcie/c29xpcie.c')
| -rw-r--r-- | board/freescale/c29xpcie/c29xpcie.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/freescale/c29xpcie/c29xpcie.c b/board/freescale/c29xpcie/c29xpcie.c index f42d373..e325b4d 100644 --- a/board/freescale/c29xpcie/c29xpcie.c +++ b/board/freescale/c29xpcie/c29xpcie.c @@ -83,9 +83,9 @@ void pci_init_board(void) } #endif /* ifdef CONFIG_PCI */ -#ifdef CONFIG_TSEC_ENET int board_eth_init(bd_t *bis) { +#ifdef CONFIG_TSEC_ENET struct fsl_pq_mdio_info mdio_info; struct tsec_info_struct tsec_info[2]; int num = 0; @@ -110,10 +110,10 @@ int board_eth_init(bd_t *bis) fsl_pq_mdio_init(bis, &mdio_info); tsec_eth_init(bis, tsec_info, num); +#endif return pci_eth_init(bis); } -#endif #if defined(CONFIG_OF_BOARD_SETUP) void fdt_del_sec(void *blob, int offset) |