diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:12:55 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:12:55 -0500 |
| commit | 6a385db5ce7f1fd2c68ec511e44587b67dab8fca (patch) | |
| tree | 9324c8ae6f7be54b9fdbd6b60f759292aa727b1f /drivers/pci/intr_remapping.c | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
| parent | 4369f1fb7cd4cf777312f43e1cb9aa5504fc4125 (diff) | |
Merge branch 'core/percpu' into x86/core
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'drivers/pci/intr_remapping.c')
| -rw-r--r-- | drivers/pci/intr_remapping.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c index f78371b22529..5a57753ea9fc 100644 --- a/drivers/pci/intr_remapping.c +++ b/drivers/pci/intr_remapping.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include <linux/irq.h> | 6 | #include <linux/irq.h> |
| 7 | #include <asm/io_apic.h> | 7 | #include <asm/io_apic.h> |
| 8 | #include <asm/smp.h> | 8 | #include <asm/smp.h> |
| 9 | #include <asm/cpu.h> | ||
| 9 | #include <linux/intel-iommu.h> | 10 | #include <linux/intel-iommu.h> |
| 10 | #include "intr_remapping.h" | 11 | #include "intr_remapping.h" |
| 11 | 12 | ||