From ceb675c3f139cab7a58bf0597d5401a7bc423dd6 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Fri, 19 Dec 2014 14:29:49 +0100 Subject: [PATCH] fix cf92821 merge issue --- targets/mlabs_video.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/mlabs_video.py b/targets/mlabs_video.py index fcc219a2..989a1666 100644 --- a/targets/mlabs_video.py +++ b/targets/mlabs_video.py @@ -4,7 +4,7 @@ from fractions import Fraction from migen.fhdl.std import * from mibuild.generic_platform import ConstraintError -from misoclib import sdram, mxcrg, norflash16, minimac3, framebuffer, gpio +from misoclib import sdram, mxcrg, norflash16, ethmac, framebuffer, gpio from misoclib.sdram.phy import s6ddrphy from misoclib.gensoc import SDRAMSoC from misoclib.ethmac.phy import mii -- 2.30.2