diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-10-28 13:17:05 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-10-28 13:17:05 -0400 |
| commit | 61c808ae1c79c5674f7c8dc2a7bbb2cddc3d7296 (patch) | |
| tree | 1ec036f7e39bbc44d6979bd8b12272e2e7aa196f /src | |
| parent | ab6b6a92022af26d8d26d16928e73d6211c7cd7b (diff) | |
| parent | 14f53b9b6b3d1b417c2c14567e2eee48d7caba9d (diff) | |
| download | gem5-61c808ae1c79c5674f7c8dc2a7bbb2cddc3d7296.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head
--HG--
extra : convert_revision : df73fd850d6638cbce6ff31203857f51235b8763
Diffstat (limited to 'src')
| -rw-r--r-- | src/SConscript | 2 |
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': |