From: Lisa Hsu <hsul@eecs.umich.edu>
Date: Tue, 11 May 2004 05:15:18 +0000 (-0400)
Subject: first pass at merging m5 with linux
X-Git-Tag: m5_1.0_tutorial~343
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a5f90eba3bd2d96c6733a6ac9e8d03a9297fae6a;p=gem5.git

first pass at merging m5 with linux

--HG--
extra : convert_revision : dfe23349b80ae3b34d3cb95c5734e01ef62f700e
---

a5f90eba3bd2d96c6733a6ac9e8d03a9297fae6a
diff --cc sim/sim_object.cc
index 2ec588afa,9626c54ea..5602a89a2
--- a/sim/sim_object.cc
+++ b/sim/sim_object.cc
@@@ -35,8 -35,7 +35,8 @@@
  #include "sim/configfile.hh"
  #include "sim/host.hh"
  #include "sim/sim_object.hh"
- #include "sim/sim_stats.hh"
+ #include "sim/stats.hh"
 +#include "sim/param.hh"
  
  using namespace std;