patch-2.2.15 linux/arch/m68k/kernel/ints.c

Next file: linux/arch/mips/kernel/irq.c
Previous file: linux/arch/i386/mm/fault.c
Back to the patch index
Back to the overall index

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/arch/m68k/kernel/ints.c linux/arch/m68k/kernel/ints.c
@@ -76,17 +76,17 @@
 void (*mach_free_irq) (unsigned int, void *) = dummy_free_irq;
 
 /*
- * void init_IRQ(void)
+ * unsigned long init_IRQ(unsigned long memory)
  *
- * Parameters:	None
+ * Parameters:	Memory base
  *
- * Returns:	Nothing
+ * Returns:	New memory base
  *
  * This function should be called during kernel startup to initialize
  * the IRQ handling routines.
  */
 
-__initfunc(void init_IRQ(void))
+unsigned long __init init_IRQ(unsigned long memory)
 {
 	int i;
 
@@ -102,6 +102,7 @@
 		nodes[i].handler = NULL;
 
 	mach_init_IRQ ();
+	return memory;
 }
 
 irq_node_t *new_irq_node(void)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)