diff options
Diffstat (limited to 'arch/m68k/amiga/config.c')
-rw-r--r-- | arch/m68k/amiga/config.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index dd0734e54bb8..df679d96b1cb 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c | |||
@@ -36,14 +36,11 @@ | |||
36 | #include <asm/machdep.h> | 36 | #include <asm/machdep.h> |
37 | #include <asm/io.h> | 37 | #include <asm/io.h> |
38 | 38 | ||
39 | unsigned long amiga_model; | 39 | static unsigned long amiga_model; |
40 | EXPORT_SYMBOL(amiga_model); | ||
41 | 40 | ||
42 | unsigned long amiga_eclock; | 41 | unsigned long amiga_eclock; |
43 | EXPORT_SYMBOL(amiga_eclock); | 42 | EXPORT_SYMBOL(amiga_eclock); |
44 | 43 | ||
45 | unsigned long amiga_masterclock; | ||
46 | |||
47 | unsigned long amiga_colorclock; | 44 | unsigned long amiga_colorclock; |
48 | EXPORT_SYMBOL(amiga_colorclock); | 45 | EXPORT_SYMBOL(amiga_colorclock); |
49 | 46 | ||
@@ -53,7 +50,7 @@ EXPORT_SYMBOL(amiga_chipset); | |||
53 | unsigned char amiga_vblank; | 50 | unsigned char amiga_vblank; |
54 | EXPORT_SYMBOL(amiga_vblank); | 51 | EXPORT_SYMBOL(amiga_vblank); |
55 | 52 | ||
56 | unsigned char amiga_psfreq; | 53 | static unsigned char amiga_psfreq; |
57 | 54 | ||
58 | struct amiga_hw_present amiga_hw_present; | 55 | struct amiga_hw_present amiga_hw_present; |
59 | EXPORT_SYMBOL(amiga_hw_present); | 56 | EXPORT_SYMBOL(amiga_hw_present); |
@@ -94,8 +91,6 @@ static char *amiga_models[] __initdata = { | |||
94 | static char amiga_model_name[13] = "Amiga "; | 91 | static char amiga_model_name[13] = "Amiga "; |
95 | 92 | ||
96 | static void amiga_sched_init(irq_handler_t handler); | 93 | static void amiga_sched_init(irq_handler_t handler); |
97 | /* amiga specific irq functions */ | ||
98 | extern void amiga_init_IRQ(void); | ||
99 | static void amiga_get_model(char *model); | 94 | static void amiga_get_model(char *model); |
100 | static int amiga_get_hardware_list(char *buffer); | 95 | static int amiga_get_hardware_list(char *buffer); |
101 | /* amiga specific timer functions */ | 96 | /* amiga specific timer functions */ |
@@ -109,8 +104,6 @@ static void amiga_reset(void); | |||
109 | extern void amiga_init_sound(void); | 104 | extern void amiga_init_sound(void); |
110 | static void amiga_mem_console_write(struct console *co, const char *b, | 105 | static void amiga_mem_console_write(struct console *co, const char *b, |
111 | unsigned int count); | 106 | unsigned int count); |
112 | void amiga_serial_console_write(struct console *co, const char *s, | ||
113 | unsigned int count); | ||
114 | #ifdef CONFIG_HEARTBEAT | 107 | #ifdef CONFIG_HEARTBEAT |
115 | static void amiga_heartbeat(int on); | 108 | static void amiga_heartbeat(int on); |
116 | #endif | 109 | #endif |
@@ -420,8 +413,7 @@ void __init config_amiga(void) | |||
420 | mach_heartbeat = amiga_heartbeat; | 413 | mach_heartbeat = amiga_heartbeat; |
421 | #endif | 414 | #endif |
422 | 415 | ||
423 | /* Fill in the clock values (based on the 700 kHz E-Clock) */ | 416 | /* Fill in the clock value (based on the 700 kHz E-Clock) */ |
424 | amiga_masterclock = 40*amiga_eclock; /* 28 MHz */ | ||
425 | amiga_colorclock = 5*amiga_eclock; /* 3.5 MHz */ | 417 | amiga_colorclock = 5*amiga_eclock; /* 3.5 MHz */ |
426 | 418 | ||
427 | /* clear all DMA bits */ | 419 | /* clear all DMA bits */ |
@@ -819,8 +811,8 @@ static void amiga_serial_putc(char c) | |||
819 | ; | 811 | ; |
820 | } | 812 | } |
821 | 813 | ||
822 | void amiga_serial_console_write(struct console *co, const char *s, | 814 | static void amiga_serial_console_write(struct console *co, const char *s, |
823 | unsigned int count) | 815 | unsigned int count) |
824 | { | 816 | { |
825 | while (count--) { | 817 | while (count--) { |
826 | if (*s == '\n') | 818 | if (*s == '\n') |
@@ -829,7 +821,7 @@ void amiga_serial_console_write(struct console *co, const char *s, | |||
829 | } | 821 | } |
830 | } | 822 | } |
831 | 823 | ||
832 | #ifdef CONFIG_SERIAL_CONSOLE | 824 | #if 0 |
833 | void amiga_serial_puts(const char *s) | 825 | void amiga_serial_puts(const char *s) |
834 | { | 826 | { |
835 | amiga_serial_console_write(NULL, s, strlen(s)); | 827 | amiga_serial_console_write(NULL, s, strlen(s)); |