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 /SConscript | |
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 'SConscript')
-rw-r--r-- | SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SConscript b/SConscript index 3693435b6..dd2df3703 100644 --- a/SConscript +++ b/SConscript @@ -188,6 +188,7 @@ full_system_sources = Split(''' dev/disk_image.cc dev/io_device.cc dev/isa_fake.cc + dev/pciconfigall.cc dev/platform.cc dev/simconsole.cc dev/simple_disk.cc @@ -221,7 +222,6 @@ full_system_sources = Split(''' # dev/ide_ctrl.cc # dev/ide_disk.cc # dev/ns_gige.cc -# dev/pciconfigall.cc # dev/pcidev.cc # dev/pcifake.cc # dev/pktfifo.cc |