projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge zizzer:/bk/m5 into vm1.reinhardt.house:/z/stever/bk/m5
[gem5.git]
/
dev
/
pcidev.cc
diff --git
a/dev/pcidev.cc
b/dev/pcidev.cc
index 76b42390adfdd47ab17ec469d36c1ecea05fbd9a..9d568e6cce2f83634f9dd1f4ad2bc3566bccbe7e 100644
(file)
--- a/
dev/pcidev.cc
+++ b/
dev/pcidev.cc
@@
-39,14
+39,13
@@
#include "base/misc.hh"
#include "base/str.hh" // for to_number
#include "base/trace.hh"
#include "base/misc.hh"
#include "base/str.hh" // for to_number
#include "base/trace.hh"
-#include "dev/pciareg.h"
#include "dev/pcidev.hh"
#include "dev/pciconfigall.hh"
#include "mem/bus/bus.hh"
#include "dev/pcidev.hh"
#include "dev/pciconfigall.hh"
#include "mem/bus/bus.hh"
-#include "mem/functional
_mem
/memory_control.hh"
+#include "mem/functional/memory_control.hh"
#include "sim/builder.hh"
#include "sim/param.hh"
#include "sim/builder.hh"
#include "sim/param.hh"
-#include "sim/
universe
.hh"
+#include "sim/
root
.hh"
#include "dev/tsunamireg.h"
using namespace std;
#include "dev/tsunamireg.h"
using namespace std;