summaryrefslogtreecommitdiff
path: root/src/dev/etherbus.hh
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@gmail.com>2008-02-11 08:31:26 -0800
committerSteve Reinhardt <stever@gmail.com>2008-02-11 08:31:26 -0800
commit71835d42df8fb488380be8cc89be4298b268902a (patch)
tree7c2e91d34de4a2306f45234fefa13ded7ea5d83f /src/dev/etherbus.hh
parent2f7421b12b4a557ff1a2e4dcebcfd3484778fb95 (diff)
parent4c7eb211191055f72c6f157913cb384f47cf4334 (diff)
downloadgem5-71835d42df8fb488380be8cc89be4298b268902a.tar.xz
Automated merge with file:/home/stever/hg/m5-orig
--HG-- extra : convert_revision : 86a55cd98a9704f756a70aa0cbd2820cf92c821d
Diffstat (limited to 'src/dev/etherbus.hh')
-rw-r--r--src/dev/etherbus.hh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dev/etherbus.hh b/src/dev/etherbus.hh
index 4deb7fccc..624ceb81a 100644
--- a/src/dev/etherbus.hh
+++ b/src/dev/etherbus.hh
@@ -62,7 +62,8 @@ class EtherBus : public EtherObject
DoneEvent(EventQueue *q, EtherBus *b)
: Event(q), bus(b) {}
virtual void process() { bus->txDone(); }
- virtual const char *description() { return "ethernet bus completion"; }
+ virtual const char *description() const
+ { return "ethernet bus completion"; }
};
DoneEvent event;