diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2005-03-11 18:32:36 -0500 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2005-03-11 18:32:36 -0500 |
| commit | e6902a907e333c09d64d520f4c978edf7e098f6a (patch) | |
| tree | 5b0acd0444285290365fbead19f081b8f3ebdd9a /sim/main.cc | |
| parent | b1f41a7aa0f617014d2bf6d5d3675830ffac213c (diff) | |
| parent | fa1650a08e56b176c2b31cd5c3b8939820e93884 (diff) | |
| download | gem5-e6902a907e333c09d64d520f4c978edf7e098f6a.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/current
--HG--
extra : convert_revision : abc24d21097770ad323a2c0d537d3e9424db0d7d
Diffstat (limited to 'sim/main.cc')
| -rw-r--r-- | sim/main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sim/main.cc b/sim/main.cc index c15d24453..ee59cb83b 100644 --- a/sim/main.cc +++ b/sim/main.cc @@ -51,6 +51,7 @@ #include "base/time.hh" #include "cpu/base_cpu.hh" #include "cpu/full_cpu/smt.hh" +#include "python/pyconfig.hh" #include "sim/async.hh" #include "sim/builder.hh" #include "sim/configfile.hh" @@ -61,7 +62,6 @@ #include "sim/stat_control.hh" #include "sim/stats.hh" #include "sim/universe.hh" -#include "sim/pyconfig/pyconfig.hh" using namespace std; |