summaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2005-06-05 04:08:41 -0400
committerAli Saidi <saidi@eecs.umich.edu>2005-06-05 04:08:41 -0400
commitd9991ff59953389251c6d081c6318ac1e0549954 (patch)
treeb9cb82ff4081ce1d5fe154d65d31d2cb446dfcbb /dev
parent2ccbeef33813dfff99bd45fa53709ea92fc67fe7 (diff)
parent5070f27c694571eb238bb2f98d69cf06d551994c (diff)
downloadgem5-d9991ff59953389251c6d081c6318ac1e0549954.tar.xz
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5-clean
--HG-- extra : convert_revision : 6fce1b31995cf5c68bd2f4bdfa2b88db6dcd006c
Diffstat (limited to 'dev')
-rw-r--r--dev/alpha_access.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/alpha_access.h b/dev/alpha_access.h
index 40567e96f..f2077acb0 100644
--- a/dev/alpha_access.h
+++ b/dev/alpha_access.h
@@ -29,11 +29,11 @@
#ifndef __ALPHA_ACCESS_H__
#define __ALPHA_ACCESS_H__
-/* @file
+/** @file
* System Console Memory Mapped Register Definition
*/
-#define ALPHA_ACCESS_VERSION (1301) /* CH++*/
+#define ALPHA_ACCESS_VERSION (1301)
#ifndef CONSOLE
#include <iosfwd>