From 51980f0be4f749c21ad44b403ab47d12290d2cba Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Thu, 18 Feb 2010 23:03:36 +0000 Subject: [PATCH] CC2420_CONF_AUTOACK is now defined in contiki-conf.h --- tools/sky/uip6-bridge/bridge-conf.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/sky/uip6-bridge/bridge-conf.h b/tools/sky/uip6-bridge/bridge-conf.h index fe96d5417..ae32a7653 100644 --- a/tools/sky/uip6-bridge/bridge-conf.h +++ b/tools/sky/uip6-bridge/bridge-conf.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bridge-conf.h,v 1.6 2010/02/03 16:48:54 adamdunkels Exp $ + * $Id: bridge-conf.h,v 1.7 2010/02/18 23:03:36 adamdunkels Exp $ */ /** @@ -53,8 +53,6 @@ #undef RF_CHANNEL #define RF_CHANNEL 26 -#define CC2420_CONF_AUTOACK 0 - #undef UIP_CONF_BUFFER_SIZE #define UIP_CONF_BUFFER_SIZE 256 #endif /* __BRIDGE_CONF_H__ */