diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-14 16:08:32 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-14 16:08:32 -0500 |
| commit | fa763d2ecfae16e84a9f9d689d19f746d84d08e3 (patch) | |
| tree | 52474edfd8d1ab010a376b1eb66f4d9990fe4a54 /arch/alpha/isa_traits.hh | |
| parent | f045b110cf1db6f9fc70589532b48d9cca339897 (diff) | |
| parent | efe46430fac2419a02062e3b282324498a55df28 (diff) | |
| download | gem5-fa763d2ecfae16e84a9f9d689d19f746d84d08e3.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
cpu/cpu_exec_context.cc:
Hand merge
--HG--
rename : arch/alpha/registerfile.hh => arch/alpha/regfile.hh
extra : convert_revision : bd18966f7c37c67c2bc7ca2633b58f70ce64409c
Diffstat (limited to 'arch/alpha/isa_traits.hh')
| -rw-r--r-- | arch/alpha/isa_traits.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/isa_traits.hh b/arch/alpha/isa_traits.hh index 1ab3b989d..5f8b00c40 100644 --- a/arch/alpha/isa_traits.hh +++ b/arch/alpha/isa_traits.hh @@ -33,7 +33,7 @@ namespace LittleEndianGuest {} #include "arch/alpha/types.hh" #include "arch/alpha/constants.hh" -#include "arch/alpha/registerfile.hh" +#include "arch/alpha/regfile.hh" #include "config/full_system.hh" #include "sim/host.hh" |