summaryrefslogtreecommitdiff
path: root/src/SConscript
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-10-31 14:44:23 -0500
committerKevin Lim <ktlim@umich.edu>2006-10-31 14:44:23 -0500
commit2fa535f7407ad2a7e1e2ec807b72d11a81fa25aa (patch)
tree29a33ada141edad37b9304227f411a0195520869 /src/SConscript
parente912080d12666482a942eae354e783c3d666c6c9 (diff)
parent7f39644609e19ada9e94c9bbb09c3e625fa6e8ed (diff)
downloadgem5-2fa535f7407ad2a7e1e2ec807b72d11a81fa25aa.tar.xz
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem --HG-- extra : convert_revision : 88fa7ae5cc32be068787ee381fae9d8de0e9bd0f
Diffstat (limited to 'src/SConscript')
-rw-r--r--src/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/SConscript b/src/SConscript
index 9f88bbeea..28f39bc29 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -220,7 +220,6 @@ full_system_sources = Split('''
dev/etherlink.cc
dev/etherpkt.cc
dev/ethertap.cc
- dev/i8254xGBe.cc
dev/ide_ctrl.cc
dev/ide_disk.cc
dev/io_device.cc
@@ -253,6 +252,7 @@ full_system_sources = Split('''
sim/pseudo_inst.cc
''')
#dev/sinic.cc
+ #dev/i8254xGBe.cc
if env['TARGET_ISA'] == 'alpha':