diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-01 22:17:41 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-01 22:17:41 -0400 |
| commit | c4361bb64b81f5b81a7a08d58654493385a2f2b2 (patch) | |
| tree | 8741c0b60ddfbc3fc4e17c8d200f6aa6ff32cca0 /arch/mips/kernel/cevt-bcm1480.c | |
| parent | 46368fa05164e1afdc1401294908cf30c6d8d981 (diff) | |
| parent | 833bb3046b6cb320e775ea2160ddca87d53260d5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/kernel/cevt-bcm1480.c')
| -rw-r--r-- | arch/mips/kernel/cevt-bcm1480.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/kernel/cevt-bcm1480.c b/arch/mips/kernel/cevt-bcm1480.c index b820661678b..a5182a20769 100644 --- a/arch/mips/kernel/cevt-bcm1480.c +++ b/arch/mips/kernel/cevt-bcm1480.c | |||
| @@ -144,7 +144,6 @@ void __cpuinit sb1480_clockevent_init(void) | |||
| 144 | 144 | ||
| 145 | action->handler = sibyte_counter_handler; | 145 | action->handler = sibyte_counter_handler; |
| 146 | action->flags = IRQF_DISABLED | IRQF_PERCPU; | 146 | action->flags = IRQF_DISABLED | IRQF_PERCPU; |
| 147 | action->mask = cpumask_of_cpu(cpu); | ||
| 148 | action->name = name; | 147 | action->name = name; |
| 149 | action->dev_id = cd; | 148 | action->dev_id = cd; |
| 150 | 149 | ||