diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2004-10-24 23:06:35 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2004-10-24 23:06:35 -0400 |
| commit | 400daa7e41057ec358691afeffe35ffa430d11b0 (patch) | |
| tree | 06eaf8242206a12eb7a14281c7d112984c02ac89 /arch/alpha/alpha_memory.cc | |
| parent | 7c58c38e668ff4057820f8c6ee8cd8169b934051 (diff) | |
| parent | 6ac0d27b7dc130397b6ba9b11e593706c2f669fe (diff) | |
| download | gem5-400daa7e41057ec358691afeffe35ffa430d11b0.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision : aac76a4b82b3455620618bba6238507248cc68cc
Diffstat (limited to 'arch/alpha/alpha_memory.cc')
| -rw-r--r-- | arch/alpha/alpha_memory.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/alpha_memory.cc b/arch/alpha/alpha_memory.cc index 4a350dbfc..b9187a92e 100644 --- a/arch/alpha/alpha_memory.cc +++ b/arch/alpha/alpha_memory.cc @@ -30,13 +30,13 @@ #include <string> #include <vector> +#include "arch/alpha/alpha_memory.hh" +#include "arch/alpha/ev5.hh" #include "base/inifile.hh" #include "base/str.hh" #include "base/trace.hh" #include "cpu/exec_context.hh" #include "sim/builder.hh" -#include "targetarch/alpha_memory.hh" -#include "targetarch/ev5.hh" using namespace std; |