Merge branch 'linus' into x86/core

2009-03-28 22:27:45 +01:00
parent 93394a761d 7c730ccdc1
commit 3fab191002
3171 changed files with 253020 additions and 129577 deletions
--- a/drivers/pci/intr_remapping.c
+++ b/drivers/pci/intr_remapping.c
@@ -21,7 +21,7 @@ struct irq_2_iommu {
 	u8  irte_mask;
 };

-#ifdef CONFIG_SPARSE_IRQ
+#ifdef CONFIG_GENERIC_HARDIRQS
 static struct irq_2_iommu *get_one_free_irq_2_iommu(int cpu)
 {
 	struct irq_2_iommu *iommu;