diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2012-01-31 22:40:08 -0800 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2012-01-31 22:40:08 -0800 |
commit | ea8b347dc5d375572d8d19770024ec8be5fd5017 (patch) | |
tree | 56bb75b1f071a749b7e90218d0d6b0e9265657bb /src/dev/copy_engine.cc | |
parent | e88165a431a90cf7e33e205794caed898ca6fcb1 (diff) | |
parent | 7d4f18770073d968c70cd3ffcdd117f50a6056a2 (diff) | |
download | gem5-ea8b347dc5d375572d8d19770024ec8be5fd5017.tar.xz |
Merge with head, hopefully the last time for this batch.
Diffstat (limited to 'src/dev/copy_engine.cc')
-rw-r--r-- | src/dev/copy_engine.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/dev/copy_engine.cc b/src/dev/copy_engine.cc index 361d4db1b..33994cfde 100644 --- a/src/dev/copy_engine.cc +++ b/src/dev/copy_engine.cc @@ -45,7 +45,6 @@ #include "sim/system.hh" using namespace CopyEngineReg; -using namespace std; CopyEngine::CopyEngine(const Params *p) : PciDev(p) |