summaryrefslogtreecommitdiff
path: root/src/dev/tsunami.hh
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-08-15 05:08:30 -0400
committerGabe Black <gblack@eecs.umich.edu>2006-08-15 05:08:30 -0400
commitcd6eb5396569bd2a3b16148f0d5277f7f4ee1391 (patch)
treef587628bf43f6374ca351c295116b8b70fc90aee /src/dev/tsunami.hh
parent74546aac0124a5ba09a0e6bfef18dc3e0b7509b8 (diff)
parentc9900f159e8d2fd7e32070e2cd0971caf917431d (diff)
downloadgem5-cd6eb5396569bd2a3b16148f0d5277f7f4ee1391.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem src/cpu/static_inst.hh: SCCS merged --HG-- extra : convert_revision : a4f6377dbd691ab58fe5f7958b983b092575f250
Diffstat (limited to 'src/dev/tsunami.hh')
-rw-r--r--src/dev/tsunami.hh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dev/tsunami.hh b/src/dev/tsunami.hh
index 8bb66e914..6fbfac851 100644
--- a/src/dev/tsunami.hh
+++ b/src/dev/tsunami.hh
@@ -83,7 +83,8 @@ class Tsunami : public Platform
/**
* Constructor for the Tsunami Class.
* @param name name of the object
- * @param intrctrl pointer to the interrupt controller
+ * @param s system the object belongs to
+ * @param intctrl pointer to the interrupt controller
*/
Tsunami(const std::string &name, System *s, IntrControl *intctrl);