Merge with head.

[gem5.git] / src / mem / packet.hh

diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index c6534d6c9a054a82ff409a743b4986b05c2484bc..2b650a51e2e8d3d46bbcd906b58885cd9c570755 100644 (file)
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -564,9 +564,6 @@ class Packet : public FastAlloc
     /** If there isn't data in the packet, allocate some. */
     void allocate();
 
-    /** Do the packet modify the same addresses. */
-    bool intersect(PacketPtr p);
-
     /**
      * Check a functional request against a memory value represented
      * by a base/size pair and an associated data array.  If the