From: James S. <jsi...@us...> - 2001-12-26 21:08:36
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/amiga In directory usw-pr-cvs1:/tmp/cvs-serv21051/arch/ppc/amiga Modified Files: config.c Log Message: Synced to 2.5.1. The USB stuff has changed thus breaking the HID stuff. Index: config.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/amiga/config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- config.c 2001/10/29 00:10:58 1.2 +++ config.c 2001/12/26 21:08:33 1.3 @@ -28,6 +28,7 @@ #ifdef CONFIG_ZORRO #include <linux/zorro.h> #endif +#include <linux/seq_file.h> #include <asm/bootinfo.h> #include <asm/setup.h> @@ -88,7 +89,7 @@ extern void amiga_disable_irq (unsigned int); static void amiga_get_model(char *model); static int amiga_get_hardware_list(char *buffer); -extern int amiga_get_irq_list (char *); +extern int show_amiga_interrupts (struct seq_file *, void *); /* amiga specific timer functions */ static unsigned long amiga_gettimeoffset (void); static void a3000_gettod (int *, int *, int *, int *, int *, int *); @@ -402,7 +403,7 @@ #endif mach_get_model = amiga_get_model; mach_get_hardware_list = amiga_get_hardware_list; - mach_get_irq_list = amiga_get_irq_list; + mach_get_irq_list = show_amiga_interrupts; mach_gettimeoffset = amiga_gettimeoffset; if (AMIGAHW_PRESENT(A3000_CLK)){ mach_gettod = a3000_gettod; |