From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Mon, 28 May 2007 04:34:37 +0000 (-0700)
Subject: Merge vm1.(none):/home/stever/bk/newmem-head
X-Git-Tag: m5_2.0_beta4~195^2~50^2~43^2~5
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=075f4b108a325e9cf2b903cd17fdbcac7598b6b0;p=gem5.git

Merge vm1.(none):/home/stever/bk/newmem-head
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : fba7efd444e1ca9738385dd4662a33feab357e79
---

075f4b108a325e9cf2b903cd17fdbcac7598b6b0
diff --cc src/mem/cache/coherence/SConscript
index 7b94f73e1,4f5966140..91720b20e
--- a/src/mem/cache/coherence/SConscript
+++ b/src/mem/cache/coherence/SConscript
@@@ -30,5 -30,8 +30,7 @@@
  
  Import('*')
  
+ SimObject('CoherenceProtocol.py')
+ 
  Source('coherence_protocol.cc')
 -Source('uni_coherence.cc')