Merge with head.

[gem5.git] / src / dev / platform.hh

diff --git a/src/dev/platform.hh b/src/dev/platform.hh
index aceec09708dc12adacf7b4cf17a72ef3804fe7a9..699b168cee484e717b210a6c2a7ef704db877faf 100644 (file)
--- a/src/dev/platform.hh
+++ b/src/dev/platform.hh
@@ -42,6 +42,7 @@
 
 #include "sim/sim_object.hh"
 #include "arch/isa_traits.hh"
+#include "params/Platform.hh"
 
 class PciConfigAll;
 class IntrControl;
@@ -59,7 +60,8 @@ class Platform : public SimObject
     System *system;
 
   public:
-    Platform(const std::string &name, IntrControl *intctrl);
+    typedef PlatformParams Params;
+    Platform(const Params *p);
     virtual ~Platform();
     virtual void postConsoleInt() = 0;
     virtual void clearConsoleInt() = 0;