diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-12 12:17:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-12 12:17:36 +0200 |
| commit | 6cda3eb62ef42aa5acd649bf99c8db544e0f4051 (patch) | |
| tree | 93f74ca002f5756c8e157611174f9540b5cf41c0 /drivers/base | |
| parent | x86/pci: update pirq_enable_irq() to setup io apic routing (diff) | |
| parent | x86: apic: Fixmap apic address even if apic disabled (diff) | |
| download | linux-6cda3eb62ef42aa5acd649bf99c8db544e0f4051.tar.xz linux-6cda3eb62ef42aa5acd649bf99c8db544e0f4051.zip | |
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/base')
| -rw-r--r-- | drivers/base/iommu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/iommu.c b/drivers/base/iommu.c index 9f0e672f4be8..8ad4ffea6920 100644 --- a/drivers/base/iommu.c +++ b/drivers/base/iommu.c @@ -18,6 +18,8 @@ #include <linux/bug.h> #include <linux/types.h> +#include <linux/module.h> +#include <linux/slab.h> #include <linux/errno.h> #include <linux/iommu.h> |