diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-27 14:59:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-27 14:59:46 -0400 |
| commit | 3fb8e49200064adcc00c327bf61942b42978d7b0 (patch) | |
| tree | c1384aa414c0867e3a9b9b5e709dc1b7738bf22e /drivers/pci/htirq.c | |
| parent | 4ebf66233798347a73b01da5d30d5d2c0ef39f56 (diff) | |
| parent | 1b6b8ce2ac372ea1f2065b89228ede105eb68dc5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: only save/restore existent registers in the PCIe capability
x86/PCI: don't bother with root quirks if _CRS is used
docbooks: add/fix PCI kernel-doc
PCI: cleanup debug output resources
x86/PCI: set_pci_bus_resources_arch_default cleanups
x86/PCI: Move set_pci_bus_resources_arch_default into arch/x86
x86/PCI: don't call e820_all_mapped with -1 in the mmconfig case
PCI quirk: disable MSI on VIA VT3364 chipsets
Diffstat (limited to 'drivers/pci/htirq.c')
| -rw-r--r-- | drivers/pci/htirq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c index bf7d6ce9bbb3..6808d8333ecc 100644 --- a/drivers/pci/htirq.c +++ b/drivers/pci/htirq.c | |||
| @@ -158,6 +158,7 @@ int ht_create_irq(struct pci_dev *dev, int idx) | |||
| 158 | 158 | ||
| 159 | /** | 159 | /** |
| 160 | * ht_destroy_irq - destroy an irq created with ht_create_irq | 160 | * ht_destroy_irq - destroy an irq created with ht_create_irq |
| 161 | * @irq: irq to be destroyed | ||
| 161 | * | 162 | * |
| 162 | * This reverses ht_create_irq removing the specified irq from | 163 | * This reverses ht_create_irq removing the specified irq from |
| 163 | * existence. The irq should be free before this happens. | 164 | * existence. The irq should be free before this happens. |