Merge with the main repository again.

[gem5.git] / src / dev / alpha / tsunami_io.hh

diff --git a/src/dev/alpha/tsunami_io.hh b/src/dev/alpha/tsunami_io.hh
index f649247e2d0e5da6bfc6cce931ff199a222cf501..f88cf5a6cf30d4ac618f6e0645d2b8714238ce4a 100644 (file)
--- a/src/dev/alpha/tsunami_io.hh
+++ b/src/dev/alpha/tsunami_io.hh
@@ -40,8 +40,8 @@
 #include "base/range.hh"
 #include "dev/alpha/tsunami.hh"
 #include "dev/intel_8254_timer.hh"
-#include "dev/mc146818.hh"
 #include "dev/io_device.hh"
+#include "dev/mc146818.hh"
 #include "params/TsunamiIO.hh"
 #include "sim/eventq.hh"
 
@@ -140,12 +140,6 @@ class TsunamiIO : public BasicPioDevice
      */
     void clearPIC(uint8_t bitvector);
 
-    /**
-     * Drain the io state including all associated events.
-     * @param drainEvent
-     */
-    unsigned int drain(Event *de);
-
     /**
      * Serialize this object to the given output stream.
      * @param os The stream to serialize to.