summaryrefslogtreecommitdiff
path: root/src/mem/bus.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/mem/bus.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/mem/bus.hh')
-rw-r--r--src/mem/bus.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/bus.hh b/src/mem/bus.hh
index 9ba43c79d..0c23175f1 100644
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@ -131,7 +131,7 @@ class Bus : public MemObject
public:
BusFreeEvent(Bus * _bus);
void process();
- const char *description();
+ const char *description() const;
};
/** a globally unique id for this bus. */