diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 06:24:38 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 06:24:38 -0500 |
| commit | c3895b01e80d120e8d19435f7cb1fa4c60c4e269 (patch) | |
| tree | 426f36e999289eeb7a41f6f4ca8ff45bfc2372aa /arch/mips/jazz/irq.c | |
| parent | 3c68b4a8071fb11d905570d9b0e23034adc6c2bb (diff) | |
| parent | 968ea6d80e395cf11a51143cfa1b9a14ada676df (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-ingo into cpus4096
Diffstat (limited to 'arch/mips/jazz/irq.c')
| -rw-r--r-- | arch/mips/jazz/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c index d7f8a782aae4..03965cb1b252 100644 --- a/arch/mips/jazz/irq.c +++ b/arch/mips/jazz/irq.c | |||
| @@ -146,7 +146,7 @@ void __init plat_time_init(void) | |||
| 146 | 146 | ||
| 147 | BUG_ON(HZ != 100); | 147 | BUG_ON(HZ != 100); |
| 148 | 148 | ||
| 149 | cd->cpumask = cpumask_of_cpu(cpu); | 149 | cd->cpumask = cpumask_of(cpu); |
| 150 | clockevents_register_device(cd); | 150 | clockevents_register_device(cd); |
| 151 | action->dev_id = cd; | 151 | action->dev_id = cd; |
| 152 | setup_irq(JAZZ_TIMER_IRQ, action); | 152 | setup_irq(JAZZ_TIMER_IRQ, action); |