summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/a20.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-08 09:43:01 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-08 09:43:01 +0200
commit3c1ca43fafea41e38cb2d0c1684119af4c1de547 (patch)
tree122e41a7b9fca26ea25ea9864180f5016274a8c8 /arch/x86/boot/a20.c
parentMerge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/bu... (diff)
parentx86: config option to disable info from decompression of the kernel (diff)
downloadlinux-3c1ca43fafea41e38cb2d0c1684119af4c1de547.tar.xz
linux-3c1ca43fafea41e38cb2d0c1684119af4c1de547.zip
Merge branch 'x86/setup' into x86/devel
Diffstat (limited to 'arch/x86/boot/a20.c')
-rw-r--r--arch/x86/boot/a20.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/boot/a20.c b/arch/x86/boot/a20.c
index e01aafd03bde..4063d630deff 100644
--- a/arch/x86/boot/a20.c
+++ b/arch/x86/boot/a20.c
@@ -1,7 +1,7 @@
/* -*- linux-c -*- ------------------------------------------------------- *
*
* Copyright (C) 1991, 1992 Linus Torvalds
- * Copyright 2007 rPath, Inc. - All Rights Reserved
+ * Copyright 2007-2008 rPath, Inc. - All Rights Reserved
*
* This file is part of the Linux kernel, and is made available under
* the terms of the GNU General Public License version 2.
@@ -95,6 +95,9 @@ static void enable_a20_kbc(void)
outb(0xdf, 0x60); /* A20 on */
empty_8042();
+
+ outb(0xff, 0x64); /* Null command, but UHCI wants it */
+ empty_8042();
}
static void enable_a20_fast(void)