summaryrefslogtreecommitdiff
path: root/src/python/m5/simulate.py
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-08-02 15:14:36 -0700
committerGabe Black <gblack@eecs.umich.edu>2007-08-02 15:14:36 -0700
commitfa9e4d110aba05fb860e299d1765249589e9b810 (patch)
tree2b2aaac3026d0b540f1557f273febfb5db5069b1 /src/python/m5/simulate.py
parent4af5740afdbd10fc4e8f9370d7b5ad49642c20e4 (diff)
parent4041e1ddd98ce0d3e21714b5830ac5f3e66c3765 (diff)
downloadgem5-fa9e4d110aba05fb860e299d1765249589e9b810.tar.xz
Merge with head.
--HG-- extra : convert_revision : 7700f475caa676948175cdf126ee018b0c4ad35c
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.