diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 | 
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 | 
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /cpu/leon2/interrupts.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
	drivers/usb/usb_ohci.c
Diffstat (limited to 'cpu/leon2/interrupts.c')
| -rw-r--r-- | cpu/leon2/interrupts.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/cpu/leon2/interrupts.c b/cpu/leon2/interrupts.c index 35b375c78..9b0da963a 100644 --- a/cpu/leon2/interrupts.c +++ b/cpu/leon2/interrupts.c @@ -98,8 +98,8 @@ static void leon2_ic_enable(unsigned int irq)  void handler_irq(int irq, struct pt_regs *regs)  {  	if (irq_handlers[irq].handler) { -		if (((unsigned int)irq_handlers[irq].handler > CFG_RAM_END) || -		    ((unsigned int)irq_handlers[irq].handler < CFG_RAM_BASE) +		if (((unsigned int)irq_handlers[irq].handler > CONFIG_SYS_RAM_END) || +		    ((unsigned int)irq_handlers[irq].handler < CONFIG_SYS_RAM_BASE)  		    ) {  			printf("handler_irq: bad handler: %x, irq number %d\n",  			       (unsigned int)irq_handlers[irq].handler, irq); @@ -163,8 +163,8 @@ void irq_install_handler(int irq, interrupt_handler_t * handler, void *arg)  		printf("irq_install_handler: 0x%08lx replacing 0x%08lx\n",  		       (ulong) handler, (ulong) irq_handlers[irq].handler); -	if (((unsigned int)handler > CFG_RAM_END) || -	    ((unsigned int)handler < CFG_RAM_BASE) +	if (((unsigned int)handler > CONFIG_SYS_RAM_END) || +	    ((unsigned int)handler < CONFIG_SYS_RAM_BASE)  	    ) {  		printf("irq_install_handler: bad handler: %x, irq number %d\n",  		       (unsigned int)handler, irq); |