diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 17:27:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 17:27:45 -0400 |
| commit | 3fab191002b184e4390aa07c7149c6cc7b638ec7 (patch) | |
| tree | 821382d49e47c19531bfc3bb9e1f8922486374d4 /drivers/pci/intr_remapping.c | |
| parent | 93394a761d78503f11d05b1a7b23d5a9ccc8dad2 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
Merge branch 'linus' into x86/core
Diffstat (limited to 'drivers/pci/intr_remapping.c')
| -rw-r--r-- | drivers/pci/intr_remapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c index bc5b6976f918..b041a409f4a7 100644 --- a/drivers/pci/intr_remapping.c +++ b/drivers/pci/intr_remapping.c | |||
| @@ -21,7 +21,7 @@ struct irq_2_iommu { | |||
| 21 | u8 irte_mask; | 21 | u8 irte_mask; |
| 22 | }; | 22 | }; |
| 23 | 23 | ||
| 24 | #ifdef CONFIG_SPARSE_IRQ | 24 | #ifdef CONFIG_GENERIC_HARDIRQS |
| 25 | static struct irq_2_iommu *get_one_free_irq_2_iommu(int cpu) | 25 | static struct irq_2_iommu *get_one_free_irq_2_iommu(int cpu) |
| 26 | { | 26 | { |
| 27 | struct irq_2_iommu *iommu; | 27 | struct irq_2_iommu *iommu; |