diff options
author | Lisa Hsu <hsul@eecs.umich.edu> | 2005-03-16 10:49:42 -0500 |
---|---|---|
committer | Lisa Hsu <hsul@eecs.umich.edu> | 2005-03-16 10:49:42 -0500 |
commit | bc6baa4049c285322fd0601a88c352fda1996dc1 (patch) | |
tree | a25c84a48af9185b06f5166ac386f8cedcdf3e3d /python/m5/objects/Ide.mpy | |
parent | 650306d5e5119e54190ce342e0b7afc182cd3c08 (diff) | |
parent | d80522183992207132e638ce2bb02513758bb61f (diff) | |
download | gem5-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/Ide.mpy')
-rw-r--r-- | python/m5/objects/Ide.mpy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/m5/objects/Ide.mpy b/python/m5/objects/Ide.mpy index ce760ad96..786109efa 100644 --- a/python/m5/objects/Ide.mpy +++ b/python/m5/objects/Ide.mpy @@ -7,7 +7,7 @@ simobj IdeDisk(SimObject): delay = Param.Tick(1, "Fixed disk delay in microseconds") driveID = Param.IdeID('master', "Drive ID") image = Param.DiskImage("Disk image") - physmem = Param.PhysicalMemory(Super, "Physical memory") + physmem = Param.PhysicalMemory(parent.any, "Physical memory") simobj IdeController(PciDevice): type = 'IdeController' |