Merge zizzer:/bk/newmem

into zeep.pool:/z/saidi/work/m5.newmem.head --HG-- extra : convert_revision : df73fd850d6638cbce6ff31203857f51235b8763
2006-10-28 13:17:05 -04:00
parent ab6b6a9202 14f53b9b6b
commit 61c808ae1c
1 changed files with 1 additions and 1 deletions
--- 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':