diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-15 15:16:35 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-15 15:16:35 -0400 |
| commit | c6e1dc61c23dc1f5300610ce8348f9a0e9c128cc (patch) | |
| tree | e044c5007a2e7e7bad6e14afee930f5626eebdec /src/dev/SConscript | |
| parent | 47c8d9d3462db91cb296f8f42b2c401e736d4daa (diff) | |
| parent | 3a5a20769b2ba15905fc2e0a833a8ecbf3098646 (diff) | |
| download | gem5-c6e1dc61c23dc1f5300610ce8348f9a0e9c128cc.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 6a75fa02391c4c65063c5412a568705bb1dd892b
Diffstat (limited to 'src/dev/SConscript')
| -rw-r--r-- | src/dev/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dev/SConscript b/src/dev/SConscript index 1ec83de4b..ea529b536 100644 --- a/src/dev/SConscript +++ b/src/dev/SConscript @@ -40,7 +40,7 @@ if env['FULL_SYSTEM']: Source('etherlink.cc') Source('etherpkt.cc') Source('ethertap.cc') - #Source('i8254xGBe.cc') + Source('i8254xGBe.cc') Source('ide_ctrl.cc') Source('ide_disk.cc') Source('io_device.cc') |