diff options
Diffstat (limited to 'arch/m68k/mac/config.c')
-rw-r--r-- | arch/m68k/mac/config.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index ad3e3bacae39..c45e18449f32 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c | |||
@@ -46,7 +46,6 @@ | |||
46 | /* Mac bootinfo struct */ | 46 | /* Mac bootinfo struct */ |
47 | 47 | ||
48 | struct mac_booter_data mac_bi_data; | 48 | struct mac_booter_data mac_bi_data; |
49 | int mac_bisize = sizeof mac_bi_data; | ||
50 | 49 | ||
51 | /* New m68k bootinfo stuff and videobase */ | 50 | /* New m68k bootinfo stuff and videobase */ |
52 | 51 | ||
@@ -55,10 +54,8 @@ extern struct mem_info m68k_memory[NUM_MEMINFO]; | |||
55 | 54 | ||
56 | extern struct mem_info m68k_ramdisk; | 55 | extern struct mem_info m68k_ramdisk; |
57 | 56 | ||
58 | void *mac_env; /* Loaded by the boot asm */ | ||
59 | |||
60 | /* The phys. video addr. - might be bogus on some machines */ | 57 | /* The phys. video addr. - might be bogus on some machines */ |
61 | unsigned long mac_orig_videoaddr; | 58 | static unsigned long mac_orig_videoaddr; |
62 | 59 | ||
63 | /* Mac specific timer functions */ | 60 | /* Mac specific timer functions */ |
64 | extern unsigned long mac_gettimeoffset(void); | 61 | extern unsigned long mac_gettimeoffset(void); |
@@ -79,6 +76,8 @@ extern void mac_mksound(unsigned int, unsigned int); | |||
79 | extern void nubus_sweep_video(void); | 76 | extern void nubus_sweep_video(void); |
80 | 77 | ||
81 | static void mac_get_model(char *str); | 78 | static void mac_get_model(char *str); |
79 | static void mac_identify(void); | ||
80 | static void mac_report_hardware(void); | ||
82 | 81 | ||
83 | static void __init mac_sched_init(irq_handler_t vector) | 82 | static void __init mac_sched_init(irq_handler_t vector) |
84 | { | 83 | { |
@@ -765,7 +764,7 @@ static struct mac_model mac_data_table[] = { | |||
765 | } | 764 | } |
766 | }; | 765 | }; |
767 | 766 | ||
768 | void __init mac_identify(void) | 767 | static void __init mac_identify(void) |
769 | { | 768 | { |
770 | struct mac_model *m; | 769 | struct mac_model *m; |
771 | 770 | ||
@@ -821,7 +820,7 @@ void __init mac_identify(void) | |||
821 | baboon_init(); | 820 | baboon_init(); |
822 | } | 821 | } |
823 | 822 | ||
824 | void __init mac_report_hardware(void) | 823 | static void __init mac_report_hardware(void) |
825 | { | 824 | { |
826 | printk(KERN_INFO "Apple Macintosh %s\n", macintosh_config->name); | 825 | printk(KERN_INFO "Apple Macintosh %s\n", macintosh_config->name); |
827 | } | 826 | } |