fix some build problems from prior changesets

2011-04-20 18:45:03 -07:00
parent 41680f4bad
commit 99fbd18ea5
13 changed files with 22 additions and 2 deletions
--- 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()