diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 15:51:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 15:51:37 -0700 |
| commit | 8ddf83fed6c283dd941ca76ae715eb268ee8c04e (patch) | |
| tree | 309628fccc4ec213afd8ebd28181703050bb046a /arch/i386/boot/pm.c | |
| parent | 0d6caa1795090bd22ede96b84daa4600b63eee37 (diff) | |
| parent | ff659d13ed91dd0b237064aba91a5259f827aeb3 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
[x86 setup] EDD: Fix the computation of the MBR sector buffer
[x86 setup] Newline after setup signature failure message
x86 boot code comments typos
Diffstat (limited to 'arch/i386/boot/pm.c')
| -rw-r--r-- | arch/i386/boot/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/boot/pm.c b/arch/i386/boot/pm.c index 1df025c7326..6be9ca811d1 100644 --- a/arch/i386/boot/pm.c +++ b/arch/i386/boot/pm.c @@ -80,7 +80,7 @@ static void move_kernel_around(void) */ static void mask_all_interrupts(void) { - outb(0xff, 0xa1); /* Mask all interrupts on the seconday PIC */ + outb(0xff, 0xa1); /* Mask all interrupts on the secondary PIC */ io_delay(); outb(0xfb, 0x21); /* Mask all but cascade on the primary PIC */ io_delay(); |