merge with m5 head

[gem5.git] / dev / pciconfigall.hh

diff --git a/dev/pciconfigall.hh b/dev/pciconfigall.hh
index 95a171c5312c00099c3709652e824d0c77a6e125..e0f7f6adae92c024d10813e5391c458016c891be 100644 (file)
--- a/dev/pciconfigall.hh
+++ b/dev/pciconfigall.hh
@@ -54,7 +54,7 @@ class PciDev;
  * space and passes the requests on to TsunamiPCIDev devices as
  * appropriate.
  */
-class PCIConfigAll : public FunctionalMemory
+class PciConfigAll : public FunctionalMemory
 {
   private:
     Addr addr;
@@ -79,7 +79,7 @@ class PCIConfigAll : public FunctionalMemory
     /**
       * The default constructor.
       */
-    PCIConfigAll(const std::string &name, Tsunami *t, Addr a,
+    PciConfigAll(const std::string &name, Tsunami *t, Addr a,
                  MemoryController *mmu);
 
     virtual Fault read(MemReqPtr &req, uint8_t *data);