[S390] Add topology_core_siblings to topology.h

[linux-2.6] / arch / m68k / hp300 / time.c

diff --git a/arch/m68k/hp300/time.c b/arch/m68k/hp300/time.c
index 086058fd8383078539c7564ad01a5e4b69d619e5..dd7c8a2583d3395eaa877580905c821f9556e3c6 100644 (file)
--- a/arch/m68k/hp300/time.c
+++ b/arch/m68k/hp300/time.c
@@ -39,7 +39,7 @@
 static irqreturn_t hp300_tick(int irq, void *dev_id)
 {
        unsigned long tmp;
-       irqreturn_t (*vector)(int, void *) = dev_id;
+       irq_handler_t vector = dev_id;
        in_8(CLOCKBASE + CLKSR);
        asm volatile ("movpw %1@(5),%0" : "=d" (tmp) : "a" (CLOCKBASE));
        /* Turn off the network and SCSI leds */
@@ -63,7 +63,7 @@ unsigned long hp300_gettimeoffset(void)
   return (USECS_PER_JIFFY * ticks) / INTVAL;
 }
 
-void __init hp300_sched_init(irqreturn_t (*vector)(int, void *))
+void __init hp300_sched_init(irq_handler_t vector)
 {
   out_8(CLOCKBASE + CLKCR2, 0x1);              /* select CR1 */
   out_8(CLOCKBASE + CLKCR1, 0x1);              /* reset */