summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/tty.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-20 23:42:55 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-20 23:42:55 +0100
commit6a8436419d1b77b24d82bd90354adc4baa393566 (patch)
treed20e17b148f37dc299658a60303e6a2e4e6ce63f /arch/x86/boot/tty.c
parentMerge branch 'topic/pcsp-fix' into topic/misc (diff)
parentALSA: ca0106 - disable 44.1kHz capture (diff)
downloadlinux-6a8436419d1b77b24d82bd90354adc4baa393566.tar.xz
linux-6a8436419d1b77b24d82bd90354adc4baa393566.zip
Merge branch 'topic/ca0106-capture-no-44khz' into topic/ca0106
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;
}