summaryrefslogtreecommitdiff
path: root/arch/x86/boot/tty.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-04 10:52:14 +0300
committerIngo Molnar <mingo@elte.hu>2008-12-04 10:52:14 +0300
commitcb9c34e6d090d376b77becaa5d29a65dec7f4272 (patch)
tree3678abce20d6825aebe3fec218057d4131e13fd6 /arch/x86/boot/tty.c
parent470c66239ef0336429b35345f3f615d47341e13b (diff)
parent061e41fdb5047b1fb161e89664057835935ca1d2 (diff)
downloadlinux-cb9c34e6d090d376b77becaa5d29a65dec7f4272.tar.xz
Merge commit 'v2.6.28-rc7' into core/locking
Diffstat (limited to 'arch/x86/boot/tty.c')
-rw-r--r--arch/x86/boot/tty.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/tty.c b/arch/x86/boot/tty.c
index 0be77b39328a..7e8e8b25f5f6 100644
--- a/arch/x86/boot/tty.c
+++ b/arch/x86/boot/tty.c
@@ -74,7 +74,7 @@ static int kbd_pending(void)
{
u8 pending;
asm volatile("int $0x16; setnz %0"
- : "=rm" (pending)
+ : "=qm" (pending)
: "a" (0x0100));
return pending;
}