diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-15 11:46:13 -0400 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-15 11:46:13 -0400 |
commit | f06d508af0ff78d7fc0e774d658cb6aedf330635 (patch) | |
tree | 1d400914f66e9ec03e34ad12a3989d3bad147d02 /src/sim/sim_object.cc | |
parent | 74b9868c786a8c58ef8fe65bebd2fd8e9573d0be (diff) | |
parent | 88e22ee081f1b0259b624fe320af22a58f144251 (diff) | |
download | gem5-f06d508af0ff78d7fc0e774d658cb6aedf330635.tar.xz |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head
--HG--
extra : convert_revision : 8a1cd7ff43aa4ebbfce0ff174d2f4ba3f095dd47
Diffstat (limited to 'src/sim/sim_object.cc')
-rw-r--r-- | src/sim/sim_object.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/sim/sim_object.cc b/src/sim/sim_object.cc index 117ca9325..97e6de439 100644 --- a/src/sim/sim_object.cc +++ b/src/sim/sim_object.cc @@ -38,7 +38,6 @@ #include "base/trace.hh" #include "base/stats/events.hh" #include "base/serializer.hh" -#include "sim/configfile.hh" #include "sim/host.hh" #include "sim/sim_object.hh" #include "sim/stats.hh" |