diff options
author | Steve Reinhardt <stever@gmail.com> | 2008-02-11 08:31:26 -0800 |
---|---|---|
committer | Steve Reinhardt <stever@gmail.com> | 2008-02-11 08:31:26 -0800 |
commit | 71835d42df8fb488380be8cc89be4298b268902a (patch) | |
tree | 7c2e91d34de4a2306f45234fefa13ded7ea5d83f /src/dev/alpha/tsunami_io.cc | |
parent | 2f7421b12b4a557ff1a2e4dcebcfd3484778fb95 (diff) | |
parent | 4c7eb211191055f72c6f157913cb384f47cf4334 (diff) | |
download | gem5-71835d42df8fb488380be8cc89be4298b268902a.tar.xz |
Automated merge with file:/home/stever/hg/m5-orig
--HG--
extra : convert_revision : 86a55cd98a9704f756a70aa0cbd2820cf92c821d
Diffstat (limited to 'src/dev/alpha/tsunami_io.cc')
-rw-r--r-- | src/dev/alpha/tsunami_io.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dev/alpha/tsunami_io.cc b/src/dev/alpha/tsunami_io.cc index e1ca1c84c..710aca48d 100644 --- a/src/dev/alpha/tsunami_io.cc +++ b/src/dev/alpha/tsunami_io.cc @@ -205,7 +205,7 @@ TsunamiIO::RTC::RTCEvent::process() } const char * -TsunamiIO::RTC::RTCEvent::description() +TsunamiIO::RTC::RTCEvent::description() const { return "tsunami RTC interrupt"; } @@ -429,7 +429,7 @@ TsunamiIO::PITimer::Counter::CounterEvent::process() } const char * -TsunamiIO::PITimer::Counter::CounterEvent::description() +TsunamiIO::PITimer::Counter::CounterEvent::description() const { return "tsunami 8254 Interval timer"; } |