summaryrefslogtreecommitdiff
path: root/python/m5/objects
diff options
context:
space:
mode:
authorBenjamin Nash <benash@umich.edu>2005-06-28 14:03:04 -0400
committerBenjamin Nash <benash@umich.edu>2005-06-28 14:03:04 -0400
commitbc76a807af2a2a874be461f0c6be9a6c5ec8bfad (patch)
tree423bd4e153fcc425dc9b7266978bd42778e55c32 /python/m5/objects
parent8b042182626b94ed6380f0ba6b99c0e862aa710f (diff)
parent036a8ceb8da8aff10b819b4aab32584d41282a64 (diff)
downloadgem5-bc76a807af2a2a874be461f0c6be9a6c5ec8bfad.tar.xz
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5 --HG-- extra : convert_revision : 453615c8194ae9ca96330b7493c6b19fc89c3a72
Diffstat (limited to 'python/m5/objects')
-rw-r--r--python/m5/objects/Ethernet.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/m5/objects/Ethernet.py b/python/m5/objects/Ethernet.py
index 2fbfb1138..a357ba346 100644
--- a/python/m5/objects/Ethernet.py
+++ b/python/m5/objects/Ethernet.py
@@ -64,7 +64,7 @@ class NSGigE(PciDevice):
hardware_address = Param.EthernetAddr(NextEthernetAddr,
"Ethernet Hardware Address")
- clock = Param.Clock('100MHz', "State machine processor frequency")
+ clock = Param.Clock('0ns', "State machine processor frequency")
dma_data_free = Param.Bool(False, "DMA of Data is free")
dma_desc_free = Param.Bool(False, "DMA of Descriptors is free")