Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13ef7b69 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 87d5df6b bb446093

drivers/pci/probe.c

+2 −1
Original line number Diff line number Diff line
@@ -276,7 +276,8 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) 
			sz = pci_size(l, sz, (u32)PCI_ROM_ADDRESS_MASK);

			if (sz) {

				res->flags = (l & IORESOURCE_ROM_ENABLE) |

				  IORESOURCE_MEM | IORESOURCE_READONLY;

				  IORESOURCE_MEM | IORESOURCE_PREFETCH |

				  IORESOURCE_READONLY | IORESOURCE_CACHEABLE;

				res->start = l & PCI_ROM_ADDRESS_MASK;

				res->end = res->start + (unsigned long) sz;

			}