From f102365bfe14d25e40fb6d5cbd184138c0593c55 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 9 Mar 2006 19:21:35 -0500 Subject: SimpleCPU compiles with merge. arch/alpha/isa_traits.hh: arch/alpha/linux/process.cc: arch/alpha/process.cc: arch/alpha/process.hh: arch/alpha/tru64/process.cc: base/chunk_generator.hh: base/loader/elf_object.cc: cpu/cpu_exec_context.cc: cpu/cpu_exec_context.hh: cpu/exec_context.hh: cpu/simple/cpu.cc: kern/linux/linux.hh: kern/tru64/tru64.hh: mem/packet.hh: mem/page_table.cc: mem/page_table.hh: mem/physical.cc: mem/request.hh: mem/translating_port.cc: sim/process.hh: sim/system.cc: Fixing merged changes. --HG-- extra : convert_revision : 2e94f21009395db654880fcb94ec806b6f5772c3 --- mem/request.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mem/request.hh') diff --git a/mem/request.hh b/mem/request.hh index c3c1d0fd4..5e2275741 100644 --- a/mem/request.hh +++ b/mem/request.hh @@ -34,7 +34,7 @@ #ifndef __MEM_REQUEST_HH__ #define __MEM_REQUEST_HH__ -#include "targetarch/isa_traits.hh" +#include "arch/isa_traits.hh" class Request; class CpuRequest; -- cgit v1.2.3