Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5

into zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 12234085865daa71e32981177d3376c93b3ed11e

base/trace.hh

@@ -43,7 +43,7 @@
 #endif
 #endif
 
-#include "base/trace_flags.hh"
+#include "base/traceflags.hh"
 
 namespace Trace {
 

base/traceflags.py

@@ -134,11 +134,7 @@ import sys
 # extract just the compound flag names into a list
 compoundFlags = []
 compoundFlags.extend(compoundFlagMap.keys())
-#for flags in compoundFlagMap.keys():
-#    compoundFlags.append(flags)
-print 'compound', compoundFlags
 compoundFlags.sort()
-print 'compound', compoundFlags
 
 #
 # First generate the header file.  This defines the Flag enum
@@ -288,7 +284,7 @@ print >>ccfile, '''\
  * Automatically generated from traceflags.pl.
  */
 
-#include "base/trace_flags.hh"
+#include "base/traceflags.hh"
 
 using namespace Trace;