Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5

[gem5.git] / sim / stat_control.hh

diff --git a/sim/stat_control.hh b/sim/stat_control.hh
index 9a5e269e1b90f1f86d633acf9b9de6bd5af7f87d..d0a9dc6ad06a9c5376d31ba5122f7168a401e49c 100644 (file)
--- a/sim/stat_control.hh
+++ b/sim/stat_control.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2004 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@
 #include <fstream>
 #include <list>
 
-namespace Statistics {
+namespace Stats {
 
 enum {
     Reset = 0x1,
@@ -47,6 +47,6 @@ void SetupEvent(int flags, Tick when, Tick repeat = 0);
 
 void InitSimStats();
 
-/* namespace Statistics */ }
+/* namespace Stats */ }
 
 #endif // __SIM_STAT_CONTROL_HH__