summaryrefslogtreecommitdiff
path: root/src/python/m5/simulate.py
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-08-02 15:38:06 -0400
committerAli Saidi <saidi@eecs.umich.edu>2007-08-02 15:38:06 -0400
commit31a9114a3d449c41a796bc26cce5dce86a4d1b15 (patch)
treee98c2fbbd384fb95c68c2867677363e1639509a6 /src/python/m5/simulate.py
parentda5f62af7bdc4a0a6c8da1eee61b0ecb1a7212b4 (diff)
parentdfa147a70ac87cdc5804993a0b39dfb8bb4cfa1b (diff)
downloadgem5-31a9114a3d449c41a796bc26cce5dce86a4d1b15.tar.xz
merge, no manual changes
--HG-- extra : convert_revision : 8504bddf1f73a4186cebc03c3e52e42ea38361fc
Diffstat (limited to 'src/python/m5/simulate.py')
-rw-r--r--src/python/m5/simulate.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py
index 1ef78d6cb..ba9fb7899 100644
--- a/src/python/m5/simulate.py
+++ b/src/python/m5/simulate.py
@@ -36,6 +36,7 @@ import internal
from main import options
import SimObject
import ticks
+import objects
# The final hook to generate .ini files. Called from the user script
# once the config is built.