reduce diff to upstream
This commit is contained in:
		
							parent
							
								
									0f8cd797d6
								
							
						
					
					
						commit
						0223193ede
					
				
					 3 changed files with 5 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -32,7 +32,7 @@ CSTANDARD = -std=gnu99
 | 
			
		|||
CDEFS = -DF_CPU=$(F_CPU)UL
 | 
			
		||||
 | 
			
		||||
# Place -I options here
 | 
			
		||||
CINCS = -Ipt 
 | 
			
		||||
CINCS = -Ipt -Itimer
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
CDEBUG = -g$(DEBUG)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,8 +4,8 @@
 | 
			
		|||
#include "util/delay.h"
 | 
			
		||||
 | 
			
		||||
#include "pt.h"
 | 
			
		||||
#include "timer/clock.h"
 | 
			
		||||
#include "timer/timer.h"
 | 
			
		||||
#include "clock.h"
 | 
			
		||||
#include "timer.h"
 | 
			
		||||
 | 
			
		||||
/* TIMER_DELAY macro for convenience */
 | 
			
		||||
#define TIMER_DELAY(pt, timer, t) \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -45,8 +45,8 @@
 | 
			
		|||
 * $Id: timer.c,v 1.2 2006/06/12 08:00:30 adam Exp $
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "timer/clock.h"
 | 
			
		||||
#include "timer/timer.h"
 | 
			
		||||
#include "clock.h"
 | 
			
		||||
#include "timer.h"
 | 
			
		||||
 | 
			
		||||
/*---------------------------------------------------------------------------*/
 | 
			
		||||
/**
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue