Merge branch 'x86/setup' into x86/devel

[linux-2.6-omap-h63xx.git] / arch / x86 / boot / a20.c

diff --git a/arch/x86/boot/a20.c b/arch/x86/boot/a20.c
index ef6e142a6b40138c3009795e73ad5da1bcbb0f7f..4063d630deff23cf2974e9839bc714de42b01f4c 100644 (file)
--- a/arch/x86/boot/a20.c
+++ b/arch/x86/boot/a20.c
@@ -118,8 +118,6 @@ static void enable_a20_fast(void)
 
 int enable_a20(void)
 {
-       int loops = A20_ENABLE_LOOPS;
-
 #if defined(CONFIG_X86_ELAN)
        /* Elan croaks if we try to touch the KBC */
        enable_a20_fast();
@@ -131,6 +129,7 @@ int enable_a20(void)
        enable_a20_kbc();
        return 0;
 #else
+       int loops = A20_ENABLE_LOOPS;
        while (loops--) {
                /* First, check to see if A20 is already enabled
                   (legacy free, etc.) */