Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / m68k / mac / config.c

diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 5fd4132..01b468b 100644 (file)
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -49,6 +49,7 @@ struct mac_booter_data mac_bi_data;
 int mac_bisize = sizeof mac_bi_data;
 
 struct mac_hw_present mac_hw_present;
+EXPORT_SYMBOL(mac_hw_present);
 
 /* New m68k bootinfo stuff and videobase */
 
@@ -84,7 +85,7 @@ extern void nubus_sweep_video(void);
 
 static void mac_get_model(char *str);
 
-static void mac_sched_init(irq_handler_t vector)
+static void __init mac_sched_init(irq_handler_t vector)
 {
        via_init_clock(vector);
 }
@@ -283,7 +284,7 @@ static struct mac_model mac_data_table[] = {
        },
 
        /*
-        *      Weirdified MacII hardware - all subtley different. Gee thanks
+        *      Weirdified MacII hardware - all subtly different. Gee thanks
         *      Apple. All these boxes seem to have VIA2 in a different place to
         *      the MacII (+1A000 rather than +4000)
         * CSA: see http://developer.apple.com/technotes/hw/hw_09.html
@@ -706,7 +707,7 @@ static struct mac_model mac_data_table[] = {
         * All of these probably have onboard SONIC in the Dock which
         * means we'll have to probe for it eventually.
         *
-        * Are these reallly MAC_VIA_IIci? The developer notes for the
+        * Are these really MAC_VIA_IIci? The developer notes for the
         * Duos show pretty much the same custom parts as in most of
         * the other PowerBooks which would imply MAC_VIA_QUADRA.
         */
@@ -769,7 +770,7 @@ static struct mac_model mac_data_table[] = {
        }
 };
 
-void mac_identify(void)
+void __init mac_identify(void)
 {
        struct mac_model *m;
 
@@ -846,7 +847,7 @@ void mac_identify(void)
        baboon_init();
 }
 
-void mac_report_hardware(void)
+void __init mac_report_hardware(void)
 {
        printk(KERN_INFO "Apple Macintosh %s\n", macintosh_config->name);
 }