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

[~andy/linux] / arch / x86 / kernel / vsmp_64.c

diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index c609205df594ba54dac5b6c0823bd3a34f486725..a1d804bcd48357554cc017f4b63c217eb2b84eaa 100644 (file)
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -139,6 +139,7 @@ int is_vsmp_box(void)
                return 0;
        }
 }
+
 #else
 static void __init detect_vsmp_box(void)
 {
@@ -148,7 +149,6 @@ int is_vsmp_box(void)
        return 0;
 }
 #endif
-
 void __init vsmp_init(void)
 {
        detect_vsmp_box();