projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix another merge issue
[gem5.git]
/
src
/
mem
/
bridge.cc
diff --git
a/src/mem/bridge.cc
b/src/mem/bridge.cc
index 3718cbaaf30ed4cfb328fe522b21e920af43e850..9c14e7ee243acdd517e97ce2a3c19260ac366253 100644
(file)
--- a/
src/mem/bridge.cc
+++ b/
src/mem/bridge.cc
@@
-31,7
+31,8
@@
*/
/**
*/
/**
- * @file Definition of a simple bus bridge without buffering.
+ * @file
+ * Definition of a simple bus bridge without buffering.
*/
#include <algorithm>
*/
#include <algorithm>
@@
-59,7
+60,7
@@
Bridge::Bridge(const std::string &n, int qsa, int qsb,
}
Port *
}
Port *
-Bridge::getPort(const std::string &if_name)
+Bridge::getPort(const std::string &if_name
, int idx
)
{
BridgePort *port;
{
BridgePort *port;