diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-20 22:16:28 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-20 22:16:28 +0300 |
| commit | fd11e153b82ad1c84ccc71ba1cfedc222465198c (patch) | |
| tree | eb62a490ca322d0a41a41ad94820677ef7737b1b /arch/sparc/kernel/pci.c | |
| parent | 505f48b53478d3816d1f3b001815703cfd7afa09 (diff) | |
| parent | aad4564498dcb0aad769a79e5e2aa9a661dfb51f (diff) | |
| download | op-kernel-dev-fd11e153b82ad1c84ccc71ba1cfedc222465198c.zip op-kernel-dev-fd11e153b82ad1c84ccc71ba1cfedc222465198c.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: Add alignment flag to PCI expansion resources
sparc: Avoid calling sigprocmask()
sparc: Use set_current_blocked()
sparc32,leon: SRMMU MMU Table probe fix
Diffstat (limited to 'arch/sparc/kernel/pci.c')
| -rw-r--r-- | arch/sparc/kernel/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index 1e94f94..8aa0d44 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -230,7 +230,8 @@ static void pci_parse_of_addrs(struct platform_device *op, res = &dev->resource[(i - PCI_BASE_ADDRESS_0) >> 2]; } else if (i == dev->rom_base_reg) { res = &dev->resource[PCI_ROM_RESOURCE]; - flags |= IORESOURCE_READONLY | IORESOURCE_CACHEABLE; + flags |= IORESOURCE_READONLY | IORESOURCE_CACHEABLE + | IORESOURCE_SIZEALIGN; } else { printk(KERN_ERR "PCI: bad cfg reg num 0x%x\n", i); continue; |
