[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/micaz hardware.h, 1.1.2.10, 1.1.2.11

[David Gay]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/micaz
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17274

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	hardware.h 
Log Message:
head merge


Index: hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/micaz/hardware.h,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** hardware.h	1 May 2006 19:20:52 -0000	1.1.2.10
--- hardware.h	22 Sep 2006 19:23:59 -0000	1.1.2.11
***************
*** 50,53 ****
--- 50,54 ----
  #include <atm128hardware.h>
  #include <Atm128Adc.h>
+ #include <MicaTimer.h>
  
  // A/D channels