diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 09:43:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 09:43:01 +0200 |
| commit | 3c1ca43fafea41e38cb2d0c1684119af4c1de547 (patch) | |
| tree | 122e41a7b9fca26ea25ea9864180f5016274a8c8 /arch/x86/boot/a20.c | |
| parent | 6924d1ab8b7bbe5ab416713f5701b3316b2df85b (diff) | |
| parent | 6bcb13b35a2ea39be6c7cc0292b8ad1191b1a748 (diff) | |
| download | linux-3c1ca43fafea41e38cb2d0c1684119af4c1de547.tar.gz linux-3c1ca43fafea41e38cb2d0c1684119af4c1de547.tar.bz2 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.c | 5 |
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) |