1 files changed, 8 insertions, 14 deletions

diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 50f5daab46b7..df679d96b1cb 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -36,14 +36,11 @@
 #include <asm/machdep.h>
 #include <asm/io.h>
 
-unsigned long amiga_model;
-EXPORT_SYMBOL(amiga_model);
+static unsigned long amiga_model;
 
 unsigned long amiga_eclock;
 EXPORT_SYMBOL(amiga_eclock);
 
-unsigned long amiga_masterclock;
-
 unsigned long amiga_colorclock;
 EXPORT_SYMBOL(amiga_colorclock);
 
@@ -51,7 +48,9 @@ unsigned long amiga_chipset;
 EXPORT_SYMBOL(amiga_chipset);
 
 unsigned char amiga_vblank;
-unsigned char amiga_psfreq;
+EXPORT_SYMBOL(amiga_vblank);
+
+static unsigned char amiga_psfreq;
 
 struct amiga_hw_present amiga_hw_present;
 EXPORT_SYMBOL(amiga_hw_present);
@@ -92,8 +91,6 @@ static char *amiga_models[] __initdata = {
 static char amiga_model_name[13] = "Amiga ";
 
 static void amiga_sched_init(irq_handler_t handler);
-/* amiga specific irq functions */
-extern void amiga_init_IRQ(void);
 static void amiga_get_model(char *model);
 static int amiga_get_hardware_list(char *buffer);
 /* amiga specific timer functions */
@@ -107,8 +104,6 @@ static void amiga_reset(void);
 extern void amiga_init_sound(void);
 static void amiga_mem_console_write(struct console *co, const char *b,
                                     unsigned int count);
-void amiga_serial_console_write(struct console *co, const char *s,
-                                unsigned int count);
 #ifdef CONFIG_HEARTBEAT
 static void amiga_heartbeat(int on);
 #endif
@@ -418,8 +413,7 @@ void __init config_amiga(void)
         mach_heartbeat = amiga_heartbeat;
 #endif
 
-        /* Fill in the clock values (based on the 700 kHz E-Clock) */
-        amiga_masterclock = 40*amiga_eclock;    /* 28 MHz */
+        /* Fill in the clock value (based on the 700 kHz E-Clock) */
         amiga_colorclock = 5*amiga_eclock;      /* 3.5 MHz */
 
         /* clear all DMA bits */
@@ -817,8 +811,8 @@ static void amiga_serial_putc(char c)
                 ;
 }
 
-void amiga_serial_console_write(struct console *co, const char *s,
-                                unsigned int count)
+static void amiga_serial_console_write(struct console *co, const char *s,
+                                       unsigned int count)
 {
         while (count--) {
                 if (*s == '\n')
@@ -827,7 +821,7 @@ void amiga_serial_console_write(struct console *co, const char *s,
         }
 }
 
-#ifdef CONFIG_SERIAL_CONSOLE
+#if 0
 void amiga_serial_puts(const char *s)
 {
         amiga_serial_console_write(NULL, s, strlen(s));