diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /arch/x86/kernel/io_apic_64.c | |
parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'arch/x86/kernel/io_apic_64.c')
-rw-r--r-- | arch/x86/kernel/io_apic_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index 1c2c7bf6a9d3..b3c2d268d708 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c | |||
@@ -1770,7 +1770,7 @@ __setup("no_timer_check", notimercheck); | |||
1770 | 1770 | ||
1771 | /* | 1771 | /* |
1772 | * | 1772 | * |
1773 | * IRQ's that are handled by the PIC in the MPS IOAPIC case. | 1773 | * IRQs that are handled by the PIC in the MPS IOAPIC case. |
1774 | * - IRQ2 is the cascade IRQ, and cannot be a io-apic IRQ. | 1774 | * - IRQ2 is the cascade IRQ, and cannot be a io-apic IRQ. |
1775 | * Linux doesn't really care, as it's not actually used | 1775 | * Linux doesn't really care, as it's not actually used |
1776 | * for any interrupt handling anyway. | 1776 | * for any interrupt handling anyway. |
@@ -1921,7 +1921,7 @@ void destroy_irq(unsigned int irq) | |||
1921 | } | 1921 | } |
1922 | 1922 | ||
1923 | /* | 1923 | /* |
1924 | * MSI mesage composition | 1924 | * MSI message composition |
1925 | */ | 1925 | */ |
1926 | #ifdef CONFIG_PCI_MSI | 1926 | #ifdef CONFIG_PCI_MSI |
1927 | static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg) | 1927 | static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg) |