diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-31 08:42:56 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-11-02 12:13:46 -0400 |
commit | 46abf4b39a555294ec0df138923daed1ccb9adb5 (patch) | |
tree | 211315bce777186654b098eb11ee6e76f765d4c2 /arch/mips/sibyte | |
parent | d1598b6adb0e7d9615f751f3bced128bcceb7378 (diff) |
[MIPS] SB1250: Use the right irqaction for the timer interrupt.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sibyte')
-rw-r--r-- | arch/mips/sibyte/sb1250/time.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/mips/sibyte/sb1250/time.c b/arch/mips/sibyte/sb1250/time.c index 181a4139dead..e224fe7715c8 100644 --- a/arch/mips/sibyte/sb1250/time.c +++ b/arch/mips/sibyte/sb1250/time.c | |||
@@ -113,12 +113,6 @@ static irqreturn_t sibyte_counter_handler(int irq, void *dev_id) | |||
113 | return IRQ_HANDLED; | 113 | return IRQ_HANDLED; |
114 | } | 114 | } |
115 | 115 | ||
116 | static struct irqaction sibyte_irqaction = { | ||
117 | .handler = sibyte_counter_handler, | ||
118 | .flags = IRQF_DISABLED | IRQF_PERCPU, | ||
119 | .name = "timer", | ||
120 | }; | ||
121 | |||
122 | static DEFINE_PER_CPU(struct clock_event_device, sibyte_hpt_clockevent); | 116 | static DEFINE_PER_CPU(struct clock_event_device, sibyte_hpt_clockevent); |
123 | static DEFINE_PER_CPU(struct irqaction, sibyte_hpt_irqaction); | 117 | static DEFINE_PER_CPU(struct irqaction, sibyte_hpt_irqaction); |
124 | static DEFINE_PER_CPU(char [18], sibyte_hpt_name); | 118 | static DEFINE_PER_CPU(char [18], sibyte_hpt_name); |
@@ -161,7 +155,7 @@ void __cpuinit sb1250_clockevent_init(void) | |||
161 | action->flags = IRQF_DISABLED | IRQF_PERCPU; | 155 | action->flags = IRQF_DISABLED | IRQF_PERCPU; |
162 | action->name = name; | 156 | action->name = name; |
163 | action->dev_id = cd; | 157 | action->dev_id = cd; |
164 | setup_irq(irq, &sibyte_irqaction); | 158 | setup_irq(irq, &action); |
165 | } | 159 | } |
166 | 160 | ||
167 | /* | 161 | /* |