Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6-omap-h63xx.git] / arch / m68k / sun3x / config.c

diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c
index 0920f5d33606d972fe349308dc76cefd93711195..2b1ca2db070fc429e25cfb9ae9140c5b26f8cbe9 100644 (file)
--- a/arch/m68k/sun3x/config.c
+++ b/arch/m68k/sun3x/config.c
@@ -6,9 +6,9 @@
  * based on code from Oliver Jowett <oliver@jowett.manawatu.gen.nz>
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/mm.h>
+#include <linux/seq_file.h>
 #include <linux/console.h>
 #include <linux/init.h>
 
@@ -32,16 +32,9 @@ void sun3_leds(unsigned int i)
 
 }
 
-static int sun3x_get_hardware_list(char *buffer)
+static void sun3x_get_hardware_list(struct seq_file *m)
 {
-
-       int len = 0;
-
-       len += sprintf(buffer + len, "PROM Revision:\t%s\n",
-                      romvec->pv_monid);
-
-       return len;
-
+       seq_printf(m, "PROM Revision:\t%s\n", romvec->pv_monid);
 }
 
 /*
@@ -52,17 +45,10 @@ void __init config_sun3x(void)
 
        sun3x_prom_init();
 
-       mach_get_irq_list        = show_sun3_interrupts;
        mach_max_dma_address = 0xffffffff; /* we can DMA anywhere, whee */
 
-       mach_default_handler = &sun3_default_handler;
        mach_sched_init      = sun3x_sched_init;
        mach_init_IRQ        = sun3_init_IRQ;
-       enable_irq           = sun3_enable_irq;
-       disable_irq          = sun3_disable_irq;
-       mach_request_irq     = sun3_request_irq;
-       mach_free_irq        = sun3_free_irq;
-       mach_process_int     = sun3_process_int;
 
        mach_gettimeoffset   = sun3x_gettimeoffset;
        mach_reset           = sun3x_reboot;