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 'x86/iommu' into x86/core
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
pci-dma.c
diff --git
a/arch/x86/kernel/pci-dma.c
b/arch/x86/kernel/pci-dma.c
index
da93c65
..
7a3dfce
100644
(file)
--- a/
arch/x86/kernel/pci-dma.c
+++ b/
arch/x86/kernel/pci-dma.c
@@
-295,8
+295,8
@@
fs_initcall(pci_iommu_init);
static __devinit void via_no_dac(struct pci_dev *dev)
{
if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI && forbid_dac == 0) {
static __devinit void via_no_dac(struct pci_dev *dev)
{
if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI && forbid_dac == 0) {
- printk(KERN_INFO
"PCI: VIA PCI bridge detected."
-
"
Disabling DAC.\n");
+ printk(KERN_INFO
+
"PCI: VIA PCI bridge detected.
Disabling DAC.\n");
forbid_dac = 1;
}
}
forbid_dac = 1;
}
}