diff options
| author | wdenk <wdenk> | 2004-02-23 23:54:43 +0000 | 
|---|---|---|
| committer | wdenk <wdenk> | 2004-02-23 23:54:43 +0000 | 
| commit | 028ab6b598b628326116acd88e0f35aa9f526d12 (patch) | |
| tree | 0d54315bd92d713a405004b6e36fca8d2b7c53e3 /cpu/arm925t/interrupts.c | |
| parent | 63e73c9a8ed5b32d9c4067ffaad953e9a8fe8f0a (diff) | |
| download | olio-uboot-2014.01-028ab6b598b628326116acd88e0f35aa9f526d12.tar.xz olio-uboot-2014.01-028ab6b598b628326116acd88e0f35aa9f526d12.zip | |
* Patch by Peter Ryser, 20 Feb 2004:
  Add support for the Xilinx ML300 platform
* Patch by Stephan Linz, 17 Feb 2004:
  Fix watchdog support for NIOS
* Patch by Josh Fryman, 16 Feb 2004:
  Fix byte-swapping for cfi_flash.c for different bus widths
* Patch by Jon Diekema, 14 Jeb 2004:
  Remove duplicate "FPGA Support" notes from the README file
Diffstat (limited to 'cpu/arm925t/interrupts.c')
| -rw-r--r-- | cpu/arm925t/interrupts.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/cpu/arm925t/interrupts.c b/cpu/arm925t/interrupts.c index 7897184fc..00e8c18e1 100644 --- a/cpu/arm925t/interrupts.c +++ b/cpu/arm925t/interrupts.c @@ -237,7 +237,7 @@ void udelay (unsigned long usec)  	}  	tmp = get_timer (0);		/* get current timestamp */ -	if( (tmo + tmp) < tmp ) 	/* if setting this fordward will roll time stamp */ +	if( (tmo + tmp + 1) < tmp ) 	/* if setting this fordward will roll time stamp */  		reset_timer_masked ();	/* reset "advancing" timestamp to 0, set lastdec value */  	else  		tmo += tmp;		/* else, set advancing stamp wake up time */ |