Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[sfrench/cifs-2.6.git] / arch / x86 / mach-generic / probe.c

diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c
index 74f3da634423e36dbcbea79f04e4d236a4802132..f410d3cb565945565bf8270dd5aef93e30b24ab8 100644 (file)
--- a/arch/x86/mach-generic/probe.c
+++ b/arch/x86/mach-generic/probe.c
@@ -22,7 +22,7 @@ extern struct genapic apic_default;
 
 struct genapic *genapic = &apic_default;
 
-struct genapic *apic_probe[] __initdata = { 
+static struct genapic *apic_probe[] __initdata = {
        &apic_summit,
        &apic_bigsmp, 
        &apic_es7000,
@@ -56,7 +56,7 @@ void __init generic_bigsmp_probe(void)
        /*
         * This routine is used to switch to bigsmp mode when
         * - There is no apic= option specified by the user
-        * - generic_apic_probe() has choosen apic_default as the sub_arch
+        * - generic_apic_probe() has chosen apic_default as the sub_arch
         * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support
         */