Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / cc2420 / link / PacketLinkC.nc

diff --git a/tos/chips/cc2420/link/PacketLinkC.nc b/tos/chips/cc2420/link/PacketLinkC.nc
index 9e2c273aa0e0621650f2eea77c2bff7bffff7781..829d32bc37daf7d4f9806d676a1011ccb4b5a78c 100644 (file)
--- a/tos/chips/cc2420/link/PacketLinkC.nc
+++ b/tos/chips/cc2420/link/PacketLinkC.nc
@@ -51,7 +51,6 @@ configuration PacketLinkC {
 implementation {
 
   components PacketLinkP,
-      ActiveMessageC,
       CC2420PacketC,
       RandomC,
       new StateC() as SendStateC,
@@ -63,8 +62,7 @@ implementation {
   
   PacketLinkP.SendState -> SendStateC;
   PacketLinkP.DelayTimer -> DelayTimerC;
-  PacketLinkP.PacketAcknowledgements -> ActiveMessageC;
-  PacketLinkP.AMPacket -> ActiveMessageC;
+  PacketLinkP.PacketAcknowledgements -> CC2420PacketC;
   PacketLinkP.CC2420PacketBody -> CC2420PacketC;
 
 }