diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-08-06 01:11:08 +0200 | 
| commit | f2c2a937d8c4a44f63ff88bf82023e03a29497a2 (patch) | |
| tree | fa8f7c9fb65d10259e76c40c52cf8277947424d4 /cpu/mpc86xx/interrupts.c | |
| parent | b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86 (diff) | |
| parent | 5728be389e65fd47f34b33c2596271eb4db751ae (diff) | |
| download | olio-uboot-2014.01-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.tar.xz olio-uboot-2014.01-f2c2a937d8c4a44f63ff88bf82023e03a29497a2.zip | |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'cpu/mpc86xx/interrupts.c')
| -rw-r--r-- | cpu/mpc86xx/interrupts.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/cpu/mpc86xx/interrupts.c b/cpu/mpc86xx/interrupts.c index 49820bbd8..08e0675fe 100644 --- a/cpu/mpc86xx/interrupts.c +++ b/cpu/mpc86xx/interrupts.c @@ -71,7 +71,7 @@ static __inline__ void set_dec(unsigned long val)  }  /* interrupt is not supported yet */ -int interrupt_init_cpu(unsigned *decrementer_count) +int interrupt_init_cpu(unsigned long *decrementer_count)  {  	return 0;  } @@ -107,7 +107,7 @@ int interrupt_init(void)  		return ret;  	decrementer_count = get_tbclk() / CFG_HZ; -	debug("interrupt init: tbclk() = %d MHz, decrementer_count = %d\n", +	debug("interrupt init: tbclk() = %d MHz, decrementer_count = %ld\n",  	      (get_tbclk() / 1000000),  	      decrementer_count); @@ -158,7 +158,7 @@ void timer_interrupt(struct pt_regs *regs)  	timestamp++; -	ppcDcbf(×tamp); +	ppcDcbf((unsigned long)×tamp);  	/* Restore Decrementer Count */  	set_dec(decrementer_count); |