diff options
| author | Tom Rini <trini@konsulko.com> | 2015-09-30 18:51:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-30 18:51:51 -0400 |
| commit | 02c2c51cf75326d7e0347672a4715cc2597166bf (patch) | |
| tree | 756e21ecc76413da7ed8826b8c87085fa773b885 /common/bootm.c | |
| parent | 4af90a6d033bdde93d2fe03ed884a20e9359c4e5 (diff) | |
| parent | 8ac46a98618ea21cf9900961fcff9cf803198271 (diff) | |
| download | u-boot-imx-02c2c51cf75326d7e0347672a4715cc2597166bf.zip u-boot-imx-02c2c51cf75326d7e0347672a4715cc2597166bf.tar.gz u-boot-imx-02c2c51cf75326d7e0347672a4715cc2597166bf.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'common/bootm.c')
| -rw-r--r-- | common/bootm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/bootm.c b/common/bootm.c index 667c934..c0d0d09 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -474,7 +474,9 @@ ulong bootm_disable_interrupts(void) #ifdef CONFIG_NETCONSOLE /* Stop the ethernet stack if NetConsole could have left it up */ eth_halt(); +# ifndef CONFIG_DM_ETH eth_unregister(eth_get_dev()); +# endif #endif #if defined(CONFIG_CMD_USB) |