X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=blobdiff_plain;f=tos%2Flib%2Fnet%2Fzigbee%2Fieee802154%2FmacTDBS%2Fmac_enumerations.h;h=d53c9cbf1aa00a41a9183880ead2192984a535fd;hp=f8004b2ce871912fc0eadbb52d9fb1732115a127;hb=e9bfab607e051bae6afb47b44892ce37541d1b44;hpb=adf1de6c009d13b7b52e68535c63b28f59c97400

diff --git a/tos/lib/net/zigbee/ieee802154/macTDBS/mac_enumerations.h b/tos/lib/net/zigbee/ieee802154/macTDBS/mac_enumerations.h
index f8004b2c..d53c9cbf 100644
--- a/tos/lib/net/zigbee/ieee802154/macTDBS/mac_enumerations.h
+++ b/tos/lib/net/zigbee/ieee802154/macTDBS/mac_enumerations.h
@@ -105,13 +105,18 @@ enum{
 };
 
 //channel scan enumerations
+#ifndef TKN154_MAC
 enum{
 	ED_SCAN = 0x00,
 	ACTIVE_SCAN = 0x01,
 	PASSIVE_SCAN = 0x02,
 	ORPHAN_SCAN = 0x03
 };
-
-
+#else
+enum{
+	ED_SCAN = 0x00
+}
+#endif
+//
 #endif