Merge from changes to Memtype and Bustype and Automerge

[gem5.git] / dev / io_device.hh

diff --git a/dev/io_device.hh b/dev/io_device.hh
index 9300d87e7d57e60d69f57ec5098c3324e8d6cbf1..8c9dc4a35172648561f1f67676d564a1ea2e1989 100644 (file)
--- a/dev/io_device.hh
+++ b/dev/io_device.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2004 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,12 +34,13 @@
 class BaseInterface;
 class Bus;
 class HierParams;
-template <class Bus> class DMAInterface;
+template <class BusType> class DMAInterface;
 
 class PioDevice : public FunctionalMemory
 {
   protected:
     BaseInterface *pioInterface;
+    Tick pioLatency;
 
   public:
     PioDevice(const std::string &name);