summaryrefslogtreecommitdiff
path: root/src/mem/bus.hh
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-06-15 11:46:13 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2006-06-15 11:46:13 -0400
commitf06d508af0ff78d7fc0e774d658cb6aedf330635 (patch)
tree1d400914f66e9ec03e34ad12a3989d3bad147d02 /src/mem/bus.hh
parent74b9868c786a8c58ef8fe65bebd2fd8e9573d0be (diff)
parent88e22ee081f1b0259b624fe320af22a58f144251 (diff)
downloadgem5-f06d508af0ff78d7fc0e774d658cb6aedf330635.tar.xz
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head --HG-- extra : convert_revision : 8a1cd7ff43aa4ebbfce0ff174d2f4ba3f095dd47
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 50bfba6e4..c2b78c31f 100644
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@ -161,7 +161,7 @@ class Bus : public MemObject
public:
/** A function used to return the port associated with this bus object. */
- virtual Port *getPort(const std::string &if_name);
+ virtual Port *getPort(const std::string &if_name, int idx = -1);
virtual void init();