Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 35815
b: refs/heads/master
c: 606bd58
h: refs/heads/master
i:
  35813: 8c83724
  35811: 758f8ff
  35807: 6c014f5
v: v3
  • Loading branch information
Diego Calleja authored and Andi Kleen committed Sep 26, 2006
1 parent 6ba38a6 commit b3a700e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cf4c6a2f27f5db810b69dcb1da7f194489e8ff88
refs/heads/master: 606bd58de6542e847c51b1b6d83a4cd70a632fe7
4 changes: 2 additions & 2 deletions trunk/arch/i386/boot/setup.S
Original file line number Diff line number Diff line change
Expand Up @@ -494,12 +494,12 @@ no_voyager:
movw %cs, %ax # aka SETUPSEG
subw $DELTA_INITSEG, %ax # aka INITSEG
movw %ax, %ds
movw $0, (0x1ff) # default is no pointing device
movb $0, (0x1ff) # default is no pointing device
int $0x11 # int 0x11: equipment list
testb $0x04, %al # check if mouse installed
jz no_psmouse

movw $0xAA, (0x1ff) # device present
movb $0xAA, (0x1ff) # device present
no_psmouse:

#if defined(CONFIG_X86_SPEEDSTEP_SMI) || defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE)
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/x86_64/boot/setup.S
Original file line number Diff line number Diff line change
Expand Up @@ -526,12 +526,12 @@ is_disk1:
movw %cs, %ax # aka SETUPSEG
subw $DELTA_INITSEG, %ax # aka INITSEG
movw %ax, %ds
movw $0, (0x1ff) # default is no pointing device
movb $0, (0x1ff) # default is no pointing device
int $0x11 # int 0x11: equipment list
testb $0x04, %al # check if mouse installed
jz no_psmouse

movw $0xAA, (0x1ff) # device present
movb $0xAA, (0x1ff) # device present
no_psmouse:

#include "../../i386/boot/edd.S"
Expand Down

0 comments on commit b3a700e

Please sign in to comment.