From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Wed, 7 Feb 2007 18:55:14 +0000 (-0800)
Subject: Merge zizzer.eecs.umich.edu:/bk/newmem
X-Git-Tag: m5_2.0_beta3~216
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b37bb67101803f12b6ed2bef714af583d03f814;p=gem5.git

Merge zizzer.eecs.umich.edu:/bk/newmem
into  vm1.(none):/home/stever/bk/newmem-head

--HG--
extra : convert_revision : c2350e01a052114a264f26551b13fca03a835c61
---

6b37bb67101803f12b6ed2bef714af583d03f814
diff --cc src/mem/packet.hh
index 60f6e9ae0,a4c003e8b..65d2207db
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@@ -40,8 -40,8 +40,9 @@@
  
  #include <cassert>
  #include <list>
 +#include <bitset>
  
+ #include "base/compiler.hh"
  #include "base/misc.hh"
  #include "mem/request.hh"
  #include "sim/host.hh"