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

[gem5.git] / cpu / intr_control.cc

diff --git a/cpu/intr_control.cc b/cpu/intr_control.cc
index c71a36b6f6c87d0f2e8c664449ea9ffa8c4a2d1a..5f17c7212c6c4c0eabe99c701271d640c157a437 100644 (file)
--- a/cpu/intr_control.cc
+++ b/cpu/intr_control.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2002-2005 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
 #include <string>
 #include <vector>
 
-#include "cpu/base_cpu.hh"
+#include "cpu/base.hh"
 #include "cpu/intr_control.hh"
 #include "sim/builder.hh"
 #include "sim/sim_object.hh"