summaryrefslogtreecommitdiff
path: root/sim/main.cc
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2005-03-14 15:40:51 -0500
committerKevin Lim <ktlim@umich.edu>2005-03-14 15:40:51 -0500
commit8f2a84cbe5a0cd26053d49fb0376ec18bcbeb8f4 (patch)
tree1b707750f5064ed9f89a4a1ecc2f2be4d3daddc0 /sim/main.cc
parentc12a665c3120b61ed4e09da5d8a52c57406763d5 (diff)
parent76e6dd01ae4a534adad1d34398fefc819771a781 (diff)
downloadgem5-8f2a84cbe5a0cd26053d49fb0376ec18bcbeb8f4.tar.xz
Merge
--HG-- extra : convert_revision : 22919164108afd74f30207606f59a38992991dae
Diffstat (limited to 'sim/main.cc')
-rw-r--r--sim/main.cc2
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;