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 f49afc0a64dd3cca3f4f0bea9df3cee121739e12..8c9dc4a35172648561f1f67676d564a1ea2e1989 100644 (file)
--- a/dev/io_device.hh
+++ b/dev/io_device.hh
@@ -34,7 +34,7 @@
 class BaseInterface;
 class Bus;
 class HierParams;
-template <class Bus> class DMAInterface;
+template <class BusType> class DMAInterface;
 
 class PioDevice : public FunctionalMemory
 {