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 / q40 / config.c

diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index cd9f505..5e0f9b0 100644 (file)
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -33,12 +33,9 @@
 #include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/traps.h>
-#include <asm/rtc.h>
 #include <asm/machdep.h>
 #include <asm/q40_master.h>
 
-extern void floppy_setup(char *str, int *ints);
-
 extern irqreturn_t q40_process_int (int level, struct pt_regs *regs);
 extern irqreturn_t (*q40_default_handler[]) (int, void *, struct pt_regs *);  /* added just for debugging */
 extern void q40_init_IRQ (void);
@@ -64,7 +61,6 @@ void q40_set_vectors (void);
 
 extern void q40_mksound(unsigned int /*freq*/, unsigned int /*ticks*/ );
 
-extern char *saved_command_line;
 extern char m68k_debug_device[];
 static void q40_mem_console_write(struct console *co, const char *b,
                                    unsigned int count);
@@ -123,7 +119,7 @@ static void q40_heartbeat(int on)
 }
 #endif
 
-void q40_reset()
+void q40_reset(void)
 {
         halted=1;
         printk ("\n\n*******************************************\n"
@@ -132,7 +128,7 @@ void q40_reset()
        Q40_LED_ON();
        while(1) ;
 }
-void q40_halt()
+void q40_halt(void)
 {
         halted=1;
         printk ("\n\n*******************\n"
@@ -159,7 +155,7 @@ static unsigned int serports[]={0x3f8,0x2f8,0x3e8,0x2e8,0};
 void q40_disable_irqs(void)
 {
   unsigned i,j;
-  
+
   j=0;
   while((i=serports[j++])) outb(0,i+UART_IER);
   master_outb(0,EXT_ENABLE_REG);
@@ -170,16 +166,16 @@ void __init config_q40(void)
 {
     mach_sched_init      = q40_sched_init;
 
-    mach_init_IRQ        = q40_init_IRQ;   
-    mach_gettimeoffset   = q40_gettimeoffset; 
-    mach_hwclk           = q40_hwclk; 
+    mach_init_IRQ        = q40_init_IRQ;
+    mach_gettimeoffset   = q40_gettimeoffset;
+    mach_hwclk           = q40_hwclk;
     mach_get_ss          = q40_get_ss;
     mach_get_rtc_pll     = q40_get_rtc_pll;
     mach_set_rtc_pll     = q40_set_rtc_pll;
     mach_set_clock_mmss         = q40_set_clock_mmss;
 
     mach_reset          = q40_reset;
-    mach_free_irq       = q40_free_irq; 
+    mach_free_irq       = q40_free_irq;
     mach_process_int    = q40_process_int;
     mach_get_irq_list   = show_q40_interrupts;
     mach_request_irq    = q40_request_irq;
@@ -196,17 +192,14 @@ void __init config_q40(void)
     mach_heartbeat = q40_heartbeat;
 #endif
     mach_halt = q40_halt;
-#ifdef CONFIG_DUMMY_CONSOLE
-    conswitchp = &dummy_con;
-#endif
 
     /* disable a few things that SMSQ might have left enabled */
     q40_disable_irqs();
 
     /* no DMA at all, but ide-scsi requires it.. make sure
-     * all physical RAM fits into the boundary - otherwise 
+     * all physical RAM fits into the boundary - otherwise
      * allocator may play costly and useless tricks */
-    mach_max_dma_address = 1024*1024*1024;   
+    mach_max_dma_address = 1024*1024*1024;
 
     /* useful for early debugging stages - writes kernel messages into SRAM */
     if (!strncmp( m68k_debug_device,"mem",3 ))
@@ -286,7 +279,7 @@ int q40_hwclk(int op, struct rtc_time *t)
          t->tm_sec  = bcd2bin (Q40_RTC_SECS);
 
          Q40_RTC_CTRL &= ~(Q40_RTC_READ);
-         
+
          if (t->tm_year < 70)
            t->tm_year += 100;
          t->tm_wday = bcd2bin(Q40_RTC_DOW)-1;
@@ -296,7 +289,7 @@ int q40_hwclk(int op, struct rtc_time *t)
        return 0;
 }
 
-unsigned int q40_get_ss()
+unsigned int q40_get_ss(void)
 {
        return bcd2bin(Q40_RTC_SECS);
 }
@@ -319,7 +312,7 @@ int q40_set_clock_mmss (unsigned long nowtime)
        if ((rtc_minutes < real_minutes
                ? real_minutes - rtc_minutes
                        : rtc_minutes - real_minutes) < 30)
-       {          
+       {
                Q40_RTC_CTRL |= Q40_RTC_WRITE;
                Q40_RTC_MINS = bin2bcd(real_minutes);
                Q40_RTC_SECS = bin2bcd(real_seconds);