projects
/
linux-2.6
/ 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/sameo/mfd-2.6
[linux-2.6]
/
arch
/
ia64
/
kernel
/
pci-swiotlb.c
diff --git
a/arch/ia64/kernel/pci-swiotlb.c
b/arch/ia64/kernel/pci-swiotlb.c
index
285aae8
..
223abb1
100644
(file)
--- a/
arch/ia64/kernel/pci-swiotlb.c
+++ b/
arch/ia64/kernel/pci-swiotlb.c
@@
-46,7
+46,7
@@
void __init swiotlb_dma_init(void)
void __init pci_swiotlb_init(void)
{
- if (!iommu_detected) {
+ if (!iommu_detected
|| iommu_pass_through
) {
#ifdef CONFIG_IA64_GENERIC
swiotlb = 1;
printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");