git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
pci-dma.c
diff --git
a/arch/x86/kernel/pci-dma.c
b/arch/x86/kernel/pci-dma.c
index 57de2ebff7e20151daa94b53ddcb74b5369bb8ca..5dcedad21dffa2a0e5428c599354c37ff1fc84be 100644
(file)
--- a/
arch/x86/kernel/pci-dma.c
+++ b/
arch/x86/kernel/pci-dma.c
@@
-140,7
+140,7
@@
rootfs_initcall(pci_iommu_init);
static int via_no_dac_cb(struct pci_dev *pdev, void *data)
{
- pdev->dev.bus_dma_
mask
= DMA_BIT_MASK(32);
+ pdev->dev.bus_dma_
limit
= DMA_BIT_MASK(32);
return 0;
}