From: James S. <jsi...@us...> - 2002-03-14 22:32:28
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/amiga In directory usw-pr-cvs1:/tmp/cvs-serv14110/linux/arch/ppc/amiga Modified Files: config.c Log Message: synced to 2.5.5 Index: config.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/amiga/config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- config.c 20 Jan 2002 03:54:45 -0000 1.4 +++ config.c 14 Mar 2002 22:32:22 -0000 1.5 @@ -1,5 +1,5 @@ /* - * BK Id: SCCS/s.config.c 1.12 09/18/01 11:19:06 paulus + * BK Id: %F% %I% %G% %U% %#% */ #define m68k_debug_device debug_device @@ -28,7 +28,6 @@ #ifdef CONFIG_ZORRO #include <linux/zorro.h> #endif -#include <linux/seq_file.h> #include <asm/bootinfo.h> #include <asm/setup.h> @@ -89,7 +88,6 @@ extern void amiga_disable_irq (unsigned int); static void amiga_get_model(char *model); static int amiga_get_hardware_list(char *buffer); -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 *); @@ -392,8 +390,8 @@ mach_sched_init = amiga_sched_init; mach_init_IRQ = amiga_init_IRQ; - mach_default_handler = &amiga_default_handler; #ifndef CONFIG_APUS + mach_default_handler = &amiga_default_handler; mach_request_irq = amiga_request_irq; mach_free_irq = amiga_free_irq; enable_irq = amiga_enable_irq; @@ -401,7 +399,6 @@ #endif mach_get_model = amiga_get_model; mach_get_hardware_list = amiga_get_hardware_list; - mach_get_irq_list = show_amiga_interrupts; mach_gettimeoffset = amiga_gettimeoffset; if (AMIGAHW_PRESENT(A3000_CLK)){ mach_gettod = a3000_gettod; |