Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index 665745b..1012b08 100644 (file)
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -7,7 +7,7 @@
  *    Added setting of time_adj to get a better clock.
  *
  *  5/14/94 Roman Hodek:
- *    gettod() for TT 
+ *    gettod() for TT
  *
  *  5/15/94 Roman Hodek:
  *    hard_reset_now() for Atari (and others?)
@@ -52,9 +52,6 @@ int atari_rtc_year_offset;
 
 /* local function prototypes */
 static void atari_reset( void );
-#ifdef CONFIG_ATARI_FLOPPY
-extern void atari_floppy_setup(char *, int *);
-#endif
 static void atari_get_model(char *model);
 static int atari_get_hardware_list(char *buffer);
 
@@ -92,7 +89,7 @@ extern void atari_debug_init(void);
  * for posterity.
  *   -- Peter Maydell <pmaydell@chiark.greenend.org.uk>, 05/1998
  */
-  
+
 #if 0
 static int __init
 hwreg_present_bywrite(volatile void *regp, unsigned char val)
@@ -100,7 +97,7 @@ hwreg_present_bywrite(volatile void *regp, unsigned char val)
     int                ret;
     long       save_sp, save_vbr;
     static long tmp_vectors[3] = { [2] = (long)&&after_test };
-       
+
     __asm__ __volatile__
        (       "movec  %/vbr,%2\n\t"   /* save vbr value            */
                 "movec %4,%/vbr\n\t"   /* set up temporary vectors  */
@@ -141,14 +138,14 @@ static int __init scc_test( volatile char *ctla )
 
        *ctla = 2; MFPDELAY();
        *ctla = 0x40; MFPDELAY();
-       
+
        *ctla = 2; MFPDELAY();
        if (*ctla != 0x40) return( 0 );
        MFPDELAY();
 
        *ctla = 2; MFPDELAY();
        *ctla = 0x60; MFPDELAY();
-       
+
        *ctla = 2; MFPDELAY();
        if (*ctla != 0x60) return( 0 );
 
@@ -199,7 +196,7 @@ void __init atari_switches_setup( const char *str, unsigned len )
            p += 3;
            ovsc_shift = ATARI_SWITCH_OVSC_SHIFT;
        }
-       
+
        if (strcmp( p, "ikbd" ) == 0) {
            /* RTS line of IKBD ACIA */
            atari_switches |= ATARI_SWITCH_IKBD << ovsc_shift;
@@ -244,12 +241,6 @@ void __init config_atari(void)
     mach_get_irq_list   = show_atari_interrupts;
     mach_gettimeoffset   = atari_gettimeoffset;
     mach_reset           = atari_reset;
-#ifdef CONFIG_ATARI_FLOPPY
-    mach_floppy_setup   = atari_floppy_setup;
-#endif
-#ifdef CONFIG_DUMMY_CONSOLE
-    conswitchp          = &dummy_con;
-#endif
     mach_max_dma_address = 0xffffff;
 #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
     mach_beep          = atari_mksound;
@@ -269,8 +260,8 @@ void __init config_atari(void)
                           ((atari_switches&ATARI_SWITCH_SND6) ? 0x40 : 0) |
                           ((atari_switches&ATARI_SWITCH_SND7) ? 0x80 : 0);
     }
-       
-    /* ++bjoern: 
+
+    /* ++bjoern:
      * Determine hardware present
      */
 
@@ -446,7 +437,7 @@ void __init config_atari(void)
                                                  : /* no outputs */
                                                  : /* no inputs */
                                                  : "d0");
-       
+
     /* allocator for memory that must reside in st-ram */
     atari_stram_init ();
 
@@ -507,7 +498,7 @@ static void atari_heartbeat( int on )
 
     if (atari_dont_touch_floppy_select)
        return;
-    
+
     local_irq_save(flags);
     sound_ym.rd_data_reg_sel = 14; /* Select PSG Port A */
     tmp = sound_ym.rd_data_reg_sel;
@@ -544,7 +535,7 @@ static void atari_heartbeat( int on )
  * address of a C label. No hope to compile this with another compiler
  * than GCC!
  */
-  
+
 /* ++andreas: no need for complicated code, just depend on prefetch */
 
 static void atari_reset (void)
@@ -563,7 +554,7 @@ static void atari_reset (void)
        acia.key_ctrl = ACIA_RESET;
     if (atari_switches & ATARI_SWITCH_OVSC_MIDI)
        acia.mid_ctrl = ACIA_RESET;
-    
+
     /* processor independent: turn off interrupts and reset the VBR;
      * the caches must be left enabled, else prefetching the final jump
      * instruction doesn't work. */
@@ -572,7 +563,7 @@ static void atari_reset (void)
        ("moveq #0,%/d0\n\t"
         "movec %/d0,%/vbr"
         : : : "d0" );
-    
+
     if (CPU_IS_040_OR_060) {
         unsigned long jmp_addr040 = virt_to_phys(&&jmp_addr_label040);
        if (CPU_IS_060) {
@@ -584,7 +575,7 @@ static void atari_reset (void)
                 ".chip 68k"
                 : : : "d0" );
        }
-           
+
         __asm__ __volatile__
             ("movel    %0,%/d0\n\t"
              "andl     #0xff000000,%/d0\n\t"