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

into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : dc165840841bdd88e40111b98d1be493441703f0

src/dev/isa_fake.cc

@@ -50,15 +50,6 @@ IsaFake::IsaFake(Params *p)
     memset(&retData, p->retData, sizeof(retData));
 }
 
-void
-IsaFake::init()
-{
-    // Only init this device if it's connected to anything.
-    if (pioPort)
-        PioDevice::init();
-}
-
-
 Tick
 IsaFake::read(PacketPtr pkt)
 {

src/dev/isa_fake.hh

@@ -80,8 +80,6 @@ class IsaFake : public BasicPioDevice
      * @param data the data to not write.
      */
     virtual Tick write(PacketPtr pkt);
-
-    void init();
 };
 
 #endif // __ISA_FAKE_HH__