aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 16:35:05 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 16:35:05 -0500
commit13ef7b69b54aa8ae4ed264d0bf41339737f8543a (patch)
treeee8e2e0081c094ebabd03f46db399dddb08b2a19 /drivers
parent87d5df6bde5764f1f6c18fe32f80e83f5010fa8c (diff)
parentbb44609361fe87c5e136c2b8dfde59bcbdbabf61 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: PCI: Restore PCI expansion ROM P2P prefetch window creation
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/probe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index c2f8a78c894c..2f75d695eed7 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -276,7 +276,8 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
276 sz = pci_size(l, sz, (u32)PCI_ROM_ADDRESS_MASK); 276 sz = pci_size(l, sz, (u32)PCI_ROM_ADDRESS_MASK);
277 if (sz) { 277 if (sz) {
278 res->flags = (l & IORESOURCE_ROM_ENABLE) | 278 res->flags = (l & IORESOURCE_ROM_ENABLE) |
279 IORESOURCE_MEM | IORESOURCE_READONLY; 279 IORESOURCE_MEM | IORESOURCE_PREFETCH |
280 IORESOURCE_READONLY | IORESOURCE_CACHEABLE;
280 res->start = l & PCI_ROM_ADDRESS_MASK; 281 res->start = l & PCI_ROM_ADDRESS_MASK;
281 res->end = res->start + (unsigned long) sz; 282 res->end = res->start + (unsigned long) sz;
282 } 283 }