aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/pci-dma_64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/pci-dma_64.c')
-rw-r--r--arch/x86/kernel/pci-dma_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index aa805b11b24f..5552d23d23c2 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -12,7 +12,7 @@
12#include <asm/gart.h> 12#include <asm/gart.h>
13#include <asm/calgary.h> 13#include <asm/calgary.h>
14 14
15int iommu_merge __read_mostly = 1; 15int iommu_merge __read_mostly = 0;
16EXPORT_SYMBOL(iommu_merge); 16EXPORT_SYMBOL(iommu_merge);
17 17
18dma_addr_t bad_dma_address __read_mostly; 18dma_addr_t bad_dma_address __read_mostly;