git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
pci-dma_64.c
diff --git
a/arch/x86/kernel/pci-dma_64.c
b/arch/x86/kernel/pci-dma_64.c
index
aa805b1
..
5552d23
100644
(file)
--- a/
arch/x86/kernel/pci-dma_64.c
+++ b/
arch/x86/kernel/pci-dma_64.c
@@
-12,7
+12,7
@@
#include <asm/gart.h>
#include <asm/calgary.h>
-int iommu_merge __read_mostly =
1
;
+int iommu_merge __read_mostly =
0
;
EXPORT_SYMBOL(iommu_merge);
dma_addr_t bad_dma_address __read_mostly;