aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/htirq.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-05-12 06:17:30 -0400
committerIngo Molnar <mingo@elte.hu>2009-05-12 06:17:36 -0400
commit6cda3eb62ef42aa5acd649bf99c8db544e0f4051 (patch)
tree93f74ca002f5756c8e157611174f9540b5cf41c0 /drivers/pci/htirq.c
parentb9c61b70075c87a8612624736faf4a2de5b1ed30 (diff)
parentcec6be6d1069d697beb490bbb40a290d5ff554a2 (diff)
Merge branch 'x86/apic' into irq/numa
Merge reason: both topics modify the APIC code but were able to do it in parallel so far. An upcoming patch generates a conflict so merge them to avoid the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/pci/htirq.c')
-rw-r--r--drivers/pci/htirq.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c
index 4e9dd0fe2745..737a1c44b07a 100644
--- a/drivers/pci/htirq.c
+++ b/drivers/pci/htirq.c
@@ -160,6 +160,7 @@ int ht_create_irq(struct pci_dev *dev, int idx)
160 160
161/** 161/**
162 * ht_destroy_irq - destroy an irq created with ht_create_irq 162 * ht_destroy_irq - destroy an irq created with ht_create_irq
163 * @irq: irq to be destroyed
163 * 164 *
164 * This reverses ht_create_irq removing the specified irq from 165 * This reverses ht_create_irq removing the specified irq from
165 * existence. The irq should be free before this happens. 166 * existence. The irq should be free before this happens.