diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-02 00:52:59 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-02 00:52:59 +0300 |
| commit | 69c1fd97266bcdcfdba1e3ea57773c80e0551e1a (patch) | |
| tree | d7c316d623fa703b9d268c2a4d3624f5a7de988b /arch/x86 | |
| parent | 72f35423e8a6a2451c202f52cb8adb92b08592ec (diff) | |
| parent | fad7c9020948eab2bc4661eade4e1ef357279590 (diff) | |
| download | linux-69c1fd97266bcdcfdba1e3ea57773c80e0551e1a.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"My attempt to revitalize trivial queue I've been neglecting for years
(what a disaster that was for this world, right? :) ) with patches
collected from backlog that were still relevant and not applied
elsewhere in the meantime"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
err.h: remove deprecated PTR_RET for good
blk-mq: Fix typo in comment
x86/boot: Fix comment spelling
sh: mach-highlander: Fix comment spelling
s390/dasd: Fix comment spelling
mfd: wm8994: Fix comment spelling
docs: Add reference in binfmt-misc.rst
genirq: fix kerneldoc comment for irq_desc
drm/amdgpu: fix two documentation mismatch issues
HID: fix Kconfig word ordering
list/hashtable: minor documentation corrections.
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/boot/apm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/apm.c b/arch/x86/boot/apm.c index b72fc10fc1be..bda15f9673d5 100644 --- a/arch/x86/boot/apm.c +++ b/arch/x86/boot/apm.c @@ -60,7 +60,7 @@ int query_apm_bios(void) intcall(0x15, &ireg, &oreg); if ((oreg.eflags & X86_EFLAGS_CF) || oreg.bx != 0x504d) { - /* Failure with 32-bit connect, try to disconect and ignore */ + /* Failure with 32-bit connect, try to disconnect and ignore */ ireg.al = 0x04; intcall(0x15, &ireg, NULL); return -1; |