diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-07-11 10:23:44 +0900 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 11:00:55 +0200 |
| commit | b8b48326f312026af12799917383c54c25d05482 (patch) | |
| tree | d995828f8b5e8487ba304ccb672e18f6ff160f2a /arch/x86/kernel/pci-dma.c | |
| parent | ac7ded2adb2e43152fe7385ddd53bf45f5c92285 (diff) | |
| download | blackbird-op-linux-b8b48326f312026af12799917383c54c25d05482.tar.gz blackbird-op-linux-b8b48326f312026af12799917383c54c25d05482.zip | |
x86: remove ifdef CONFIG_CALGARY_IOMMU in pci-dma.c
asm-x86/calgary.h has dummy calgary_iommu_init() and detect_calgary()
in !CONFIG_CALGARY_IOMMU case. So we don't need ifdef
CONFIG_CALGARY_IOMMU in pci-dma.c.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Cc: Alexis Bruemmer <alexisb@us.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/pci-dma.c')
| -rw-r--r-- | arch/x86/kernel/pci-dma.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index dd57c5bbe2da..f16cbbe424a1 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -116,9 +116,7 @@ void __init pci_iommu_alloc(void) */ gart_iommu_hole_init(); -#ifdef CONFIG_CALGARY_IOMMU detect_calgary(); -#endif detect_intel_iommu(); @@ -496,9 +494,7 @@ EXPORT_SYMBOL(dma_free_coherent); static int __init pci_iommu_init(void) { -#ifdef CONFIG_CALGARY_IOMMU calgary_iommu_init(); -#endif intel_iommu_init(); |
