summaryrefslogtreecommitdiff
path: root/src/SConscript
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-07-06 16:51:50 -0400
committerKevin Lim <ktlim@umich.edu>2006-07-06 16:51:50 -0400
commitb55cda163ed1a29ee5e08cde36743047923ab475 (patch)
tree3e94908acce5edfa05b76cf87a7d5b1ef012a720 /src/SConscript
parentec72f6534c2bb6aada305815fb306680508d7a7c (diff)
parenta1d208a65de95ee14c52fdc6ca9401642e07293d (diff)
downloadgem5-b55cda163ed1a29ee5e08cde36743047923ab475.tar.xz
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem --HG-- extra : convert_revision : 7c7fc8a2f9579d443786e86dbcf906b355de69fc
Diffstat (limited to 'src/SConscript')
-rw-r--r--src/SConscript1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/SConscript b/src/SConscript
index 0d0cb2486..9825cafe7 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -89,7 +89,6 @@ base_sources = Split('''
cpu/pc_event.cc
cpu/quiesce_event.cc
cpu/static_inst.cc
- cpu/sampler/sampler.cc
cpu/simple_thread.cc
cpu/thread_state.cc