Automated merge with ssh://hg@repo.m5sim.org/m5

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

diff --git a/src/dev/uart8250.hh b/src/dev/uart8250.hh
index 32b16c17cf016265c24bc755a493bd40758f9c72..79c31d5cf52d24b37042dc6c35b27ccf82af462a 100644 (file)
--- a/src/dev/uart8250.hh
+++ b/src/dev/uart8250.hh
@@ -65,7 +65,7 @@ const uint8_t UART_LSR_DR   = 0x01;
 const uint8_t UART_MCR_LOOP = 0x10;
 
 
-class SimConsole;
+class Terminal;
 class Platform;
 
 class Uart8250 : public Uart
@@ -82,7 +82,7 @@ class Uart8250 : public Uart
         public:
             IntrEvent(Uart8250 *u, int bit);
             virtual void process();
-            virtual const char *description();
+            virtual const char *description() const;
             void scheduleIntr();
     };