summaryrefslogtreecommitdiff
path: root/cpu/base.hh
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-02-19 03:04:44 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-02-19 03:04:44 -0500
commited25d326174f8086a8224ecb9e798410db14cddb (patch)
tree8ec20b844bb3b19940c304070251720c6998f1bd /cpu/base.hh
parent0e4a80df1a471671b6ef7003e29124b6835ade42 (diff)
downloadgem5-ed25d326174f8086a8224ecb9e798410db14cddb.tar.xz
Remade some changes which were undone
cpu/base.hh: cpu/static_inst.hh: Changed include of targetarch/isa_traits.hh back to arch/isa_traits.hh cpu/exec_context.hh: Changed Fault back to Fault * --HG-- extra : convert_revision : 410f2e2472f8aa5bf92619a5defdf85f689a5597
Diffstat (limited to 'cpu/base.hh')
-rw-r--r--cpu/base.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/base.hh b/cpu/base.hh
index 82a47bf4c..311b50f7f 100644
--- a/cpu/base.hh
+++ b/cpu/base.hh
@@ -36,7 +36,7 @@
#include "cpu/sampler/sampler.hh"
#include "sim/eventq.hh"
#include "sim/sim_object.hh"
-#include "targetarch/isa_traits.hh"
+#include "arch/isa_traits.hh"
#if FULL_SYSTEM
class System;