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

[gem5.git] / sim / main.cc

diff --git a/sim/main.cc b/sim/main.cc
index b28cac15b49c5c18dab4b1030323d6d431d2bf4a..6f6143506aa06857ef42a544ca1f47b4a88514ff 100644 (file)
--- a/sim/main.cc
+++ b/sim/main.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2004 The Regents of The University of Michigan
+ * Copyright (c) 2000-2005 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,8 +49,8 @@
 #include "base/statistics.hh"
 #include "base/str.hh"
 #include "base/time.hh"
-#include "cpu/base_cpu.hh"
-#include "cpu/full_cpu/smt.hh"
+#include "cpu/base.hh"
+#include "cpu/smt.hh"
 #include "python/pyconfig.hh"
 #include "sim/async.hh"
 #include "sim/builder.hh"