Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

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

diff --git a/arch/i386/mach-generic/probe.c b/arch/i386/mach-generic/probe.c
index 94b1fd9cbe3cdaef7aaed0b5dcb84bfcff12d7a4..a7b3999bb37a8e4ab63b8f189de86e2619ee89fb 100644 (file)
--- a/arch/i386/mach-generic/probe.c
+++ b/arch/i386/mach-generic/probe.c
@@ -45,7 +45,9 @@ static int __init parse_apic(char *arg)
                        return 0;
                }
        }
-       return -ENOENT;
+
+       /* Parsed again by __setup for debug/verbose */
+       return 0;
 }
 early_param("apic", parse_apic);