diff options
author | Jon Loeliger <jdl@freescale.com> | 2007-11-07 14:08:15 -0600 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2007-11-07 14:08:15 -0600 |
commit | 607b3ae27efdb709719f0713113fcf4b073676c1 (patch) | |
tree | e8453252f9987f99deeb7d7b98b7b6d99b5433cf /cpu/mpc824x | |
parent | 3cac27c1d40b151f295dcfdb514fa928732e4ecf (diff) | |
parent | 992742a5b09d9040adbd156fb90756af66ade310 (diff) |
Merge commit 'remotes/wd/master' into newmaster
Diffstat (limited to 'cpu/mpc824x')
-rw-r--r-- | cpu/mpc824x/interrupts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/mpc824x/interrupts.c b/cpu/mpc824x/interrupts.c index acb8947e0d..4359ecc05e 100644 --- a/cpu/mpc824x/interrupts.c +++ b/cpu/mpc824x/interrupts.c @@ -86,7 +86,7 @@ void irq_free_handler (int vec) vga? */ -void timer_interrupt_cpu (struct pt_regs *regs, ulong timestamp) +void timer_interrupt_cpu (struct pt_regs *regs) { /* nothing to do here */ return; |