Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

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

diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c
index 25ab5d9..9878917 100644 (file)
--- a/arch/m68k/sun3x/config.c
+++ b/arch/m68k/sun3x/config.c
@@ -33,12 +33,12 @@ void sun3_leds(unsigned int i)
 
 static int sun3x_get_hardware_list(char *buffer)
 {
-       
+
        int len = 0;
 
        len += sprintf(buffer + len, "PROM Revision:\t%s\n",
                       romvec->pv_monid);
-       
+
        return len;
 
 }
@@ -51,18 +51,11 @@ 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;
 
@@ -73,7 +66,7 @@ void __init config_sun3x(void)
        sun3_intreg = (unsigned char *)SUN3X_INTREG;
 
        /* only the serial console is known to work anyway... */
-#if 0    
+#if 0
        switch (*(unsigned char *)SUN3X_EEPROM_CONS) {
        case 0x10:
                serial_console = 1;