diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-03-18 15:32:53 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-03-18 15:32:53 -0500 |
| commit | cfa4221e19459d2179ba5601cf71a7a53753a3b1 (patch) | |
| tree | 108c984e4fb9ef421557f610c210aa76c4dd70ed /python/m5/objects/Ethernet.mpy | |
| parent | 363f02a1fd0a8ae8c91152ccde4453b934d7d3d4 (diff) | |
| parent | 3efabb657948e53462bfe60ca93a2ac147074ea1 (diff) | |
| download | gem5-cfa4221e19459d2179ba5601cf71a7a53753a3b1.tar.xz | |
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision : cbf8da2fe5c4155d9ed8318597d543ff105449d3
Diffstat (limited to 'python/m5/objects/Ethernet.mpy')
| -rw-r--r-- | python/m5/objects/Ethernet.mpy | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/m5/objects/Ethernet.mpy b/python/m5/objects/Ethernet.mpy index 088df4b93..cd251f36d 100644 --- a/python/m5/objects/Ethernet.mpy +++ b/python/m5/objects/Ethernet.mpy @@ -49,8 +49,8 @@ simobj EtherDev(DmaDevice): intr_delay = Param.Tick(0, "Interrupt Delay in microseconds") payload_bus = Param.Bus(NULL, "The IO Bus to attach to for payload") - physmem = Param.PhysicalMemory(Super, "Physical Memory") - tlaser = Param.Turbolaser(Super, "Turbolaser") + physmem = Param.PhysicalMemory(parent.any, "Physical Memory") + tlaser = Param.Turbolaser(parent.any, "Turbolaser") simobj NSGigE(PciDevice): type = 'NSGigE' @@ -73,7 +73,7 @@ simobj NSGigE(PciDevice): intr_delay = Param.Tick(0, "Interrupt Delay in microseconds") payload_bus = Param.Bus(NULL, "The IO Bus to attach to for payload") - physmem = Param.PhysicalMemory(Super, "Physical Memory") + physmem = Param.PhysicalMemory(parent.any, "Physical Memory") simobj EtherDevInt(EtherInt): type = 'EtherDevInt' |