summaryrefslogtreecommitdiff
path: root/src/python/m5/simulate.py
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2011-04-20 18:45:03 -0700
committerNathan Binkert <nate@binkert.org>2011-04-20 18:45:03 -0700
commit99fbd18ea53417eff0c2b5afd088022b3561c89e (patch)
tree588eb96f7c763221202f732488169cc783984a01 /src/python/m5/simulate.py
parent41680f4bada2e3b0f8a030c76ecdb6a2aa778b2e (diff)
downloadgem5-99fbd18ea53417eff0c2b5afd088022b3561c89e.tar.xz
fix some build problems from prior changesets
Diffstat (limited to 'src/python/m5/simulate.py')
-rw-r--r--src/python/m5/simulate.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py
index 184c2c6f7..9a5dc836d 100644
--- a/src/python/m5/simulate.py
+++ b/src/python/m5/simulate.py
@@ -47,7 +47,7 @@ MaxTick = 2**63 - 1
# The final hook to generate .ini files. Called from the user script
# once the config is built.
def instantiate(ckpt_dir=None):
- from main import options
+ from m5 import options
root = objects.Root.getInstance()