summaryrefslogtreecommitdiff
path: root/src/dev/etherbus.cc
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-03-06 20:58:44 +0000
committerGabe Black <gblack@eecs.umich.edu>2007-03-06 20:58:44 +0000
commit44f91bb4443ed55a8e75096f1a821fd7605b7771 (patch)
tree39ffcc423e52760b67a9b7984fe2d652f56e8c92 /src/dev/etherbus.cc
parent05c86ec0d7662ccefc5690a4445fcf2976d16622 (diff)
parent329db76e47c825d4ecbe0f5251dbcfaf2ec09516 (diff)
downloadgem5-44f91bb4443ed55a8e75096f1a821fd7605b7771.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86 --HG-- extra : convert_revision : 0822fbcc377781b53d2de9ba40ab9d985ccbc039
Diffstat (limited to 'src/dev/etherbus.cc')
-rw-r--r--src/dev/etherbus.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dev/etherbus.cc b/src/dev/etherbus.cc
index 348bb818a..cedb3cd4d 100644
--- a/src/dev/etherbus.cc
+++ b/src/dev/etherbus.cc
@@ -43,7 +43,7 @@
#include "dev/etherint.hh"
#include "dev/etherpkt.hh"
#include "sim/builder.hh"
-#include "sim/root.hh"
+#include "sim/core.hh"
using namespace std;