summaryrefslogtreecommitdiff
path: root/src/python/m5/__init__.py
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2011-04-15 10:44:59 -0700
committerNathan Binkert <nate@binkert.org>2011-04-15 10:44:59 -0700
commit8c97726266a83fda31f8a68860157f195d7466ea (patch)
treee5d0a6a412003a26a3d57b20cf3717e123640f8f /src/python/m5/__init__.py
parent3182913e94674fcd101ec01c7ffb8245ec3046f8 (diff)
downloadgem5-8c97726266a83fda31f8a68860157f195d7466ea.tar.xz
python: cleanup python code so stuff doesn't automatically happen at startup
this allows things to be overridden at startup (e.g. for tests)
Diffstat (limited to 'src/python/m5/__init__.py')
-rw-r--r--src/python/m5/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py
index b5af7a80f..e152cf021 100644
--- a/src/python/m5/__init__.py
+++ b/src/python/m5/__init__.py
@@ -49,5 +49,5 @@ if internal:
import util
from event import *
- from main import options, main
+ from main import main
from simulate import *