Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/core

[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 fba8e9c6a504edd049d2dcad7bca7938469f5578..7c19ce8c2442c219a1e85ee22798a8abaa0bdf2c 100644 (file)
--- a/arch/x86/boot/a20.c
+++ b/arch/x86/boot/a20.c
@@ -126,11 +126,6 @@ static void enable_a20_fast(void)
 
 int enable_a20(void)
 {
-#ifdef CONFIG_X86_VOYAGER
-       /* On Voyager, a20_test() is unsafe? */
-       enable_a20_kbc();
-       return 0;
-#else
        int loops = A20_ENABLE_LOOPS;
        int kbc_err;
 
@@ -164,5 +159,4 @@ int enable_a20(void)
        }
        
        return -1;
-#endif
 }