diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-11 13:43:15 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-11 13:43:15 -0400 |
commit | 194fb50fbd3f00577ce129762c9a8f13c721e4ad (patch) | |
tree | fa464892deda45dae86ff3c847cc7ae9aea0db22 /dev/platform.cc | |
parent | da7990ab337699ae788809ddaea5ba5c363e0015 (diff) | |
parent | f6fc18f03d639098b1421fa3412329773b0a6ab1 (diff) | |
download | gem5-194fb50fbd3f00577ce129762c9a8f13c721e4ad.tar.xz |
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : ef75b46b9c1c267c84e6bb2b2234d46c4edcda16
Diffstat (limited to 'dev/platform.cc')
-rw-r--r-- | dev/platform.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/platform.cc b/dev/platform.cc index 5b667b12c..9d10e0828 100644 --- a/dev/platform.cc +++ b/dev/platform.cc @@ -33,8 +33,8 @@ using namespace std; using namespace TheISA; -Platform::Platform(const string &name, IntrControl *intctrl, PciConfigAll *pci) - : SimObject(name), intrctrl(intctrl), pciconfig(pci) +Platform::Platform(const string &name, IntrControl *intctrl) + : SimObject(name), intrctrl(intctrl) { } |