Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5

[gem5.git] / dev / baddev.hh

diff --git a/dev/baddev.hh b/dev/baddev.hh
index b7b67e31afcd88a5f316dac6f8a19c283dd04f43..c2a204c051bb59353990b306123aadeb1794d9ef 100644 (file)
--- a/dev/baddev.hh
+++ b/dev/baddev.hh
@@ -71,7 +71,7 @@ class BadDevice : public PioDevice
       * @param data A pointer to write the read data to.
       * @return The fault condition of the access.
       */
-    virtual Fault * read(MemReqPtr &req, uint8_t *data);
+    virtual Fault read(MemReqPtr &req, uint8_t *data);
 
     /**
       * On a write event we just panic aand hopefully print a
@@ -80,7 +80,7 @@ class BadDevice : public PioDevice
       * @param data The data to write.
       * @return The fault condition of the access.
       */
-    virtual Fault * write(MemReqPtr &req, const uint8_t *data);
+    virtual Fault write(MemReqPtr &req, const uint8_t *data);
 
     /**
      * Return how long this access will take.