summaryrefslogtreecommitdiff
path: root/python/m5/objects/SimpleDisk.mpy
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2005-03-16 10:49:42 -0500
committerLisa Hsu <hsul@eecs.umich.edu>2005-03-16 10:49:42 -0500
commitbc6baa4049c285322fd0601a88c352fda1996dc1 (patch)
treea25c84a48af9185b06f5166ac386f8cedcdf3e3d /python/m5/objects/SimpleDisk.mpy
parent650306d5e5119e54190ce342e0b7afc182cd3c08 (diff)
parentd80522183992207132e638ce2bb02513758bb61f (diff)
downloadgem5-bc6baa4049c285322fd0601a88c352fda1996dc1.tar.xz
Merge zizzer:/bk/m5
into zizzer.eecs.umich.edu:/.automount/zed/z/hsul/work/m5/pact05 --HG-- extra : convert_revision : e7ff23f6ac4e434d8b3117275df12fec03964a55
Diffstat (limited to 'python/m5/objects/SimpleDisk.mpy')
-rw-r--r--python/m5/objects/SimpleDisk.mpy2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/m5/objects/SimpleDisk.mpy b/python/m5/objects/SimpleDisk.mpy
index c4dd5435b..b616fb3d1 100644
--- a/python/m5/objects/SimpleDisk.mpy
+++ b/python/m5/objects/SimpleDisk.mpy
@@ -1,4 +1,4 @@
simobj SimpleDisk(SimObject):
type = 'SimpleDisk'
disk = Param.DiskImage("Disk Image")
- physmem = Param.PhysicalMemory(Super, "Physical Memory")
+ physmem = Param.PhysicalMemory(parent.any, "Physical Memory")