diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-07-24 15:48:40 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-07-24 15:48:40 -0700 |
| commit | 26b1c455e0aed69eda0cc165b5084edb1b557c38 (patch) | |
| tree | 0b7ffa9259c55f9a639a12f09ddef033d78b084b /src/mem/MemObject.py | |
| parent | 02c39000bfc6be620382bf89636e3b1bbb2f4cf6 (diff) | |
| parent | abc76f20cb98c90e8dab416dd16dfd4a954013ba (diff) | |
| download | gem5-26b1c455e0aed69eda0cc165b5084edb1b557c38.tar.xz | |
Merge with head.
--HG--
extra : convert_revision : 4a34b3f91c4fc90055596245ae3efec45ea33888
Diffstat (limited to 'src/mem/MemObject.py')
| -rw-r--r-- | src/mem/MemObject.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mem/MemObject.py b/src/mem/MemObject.py index 269cf4403..e2e858494 100644 --- a/src/mem/MemObject.py +++ b/src/mem/MemObject.py @@ -27,7 +27,6 @@ # Authors: Ron Dreslinski from m5.SimObject import SimObject -from m5.SimObject import SimObject class MemObject(SimObject): type = 'MemObject' |