Merge zizzer.eecs.umich.edu:/bk/m5/

[gem5.git] / dev / uart.hh

diff --git a/dev/uart.hh b/dev/uart.hh
index ac8ed7d733e899a6e8bfbe6328277506d969127a..d1f167526943dc2973dc9d4f0c79f7ce730a52b0 100644 (file)
--- a/dev/uart.hh
+++ b/dev/uart.hh
@@ -72,10 +72,9 @@ class Uart : public PioDevice
 
     IntrEvent txIntrEvent;
     IntrEvent rxIntrEvent;
-    Platform *platform;
 
   public:
-    Uart(const string &name, SimConsole *c, MemoryController *mmu,
+    Uart(const std::string &name, SimConsole *c, MemoryController *mmu,
          Addr a, Addr s, HierParams *hier, Bus *bus, Tick pio_latency,
          Platform *p);