diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-17 09:52:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-17 09:52:24 -0700 |
| commit | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (patch) | |
| tree | 1be905db5b97da31358851aee538fa19ea6381c4 /include/linux | |
| parent | 84841384ec6ec57544b76e564514d3f9eb6c1901 (diff) | |
| parent | c40e7cb89f9d36924131ef708ff1f16a76611add (diff) | |
| download | linux-stable-bde4f8fa8db2abd5ac9c542d76012d0fedab050f.tar.gz linux-stable-bde4f8fa8db2abd5ac9c542d76012d0fedab050f.tar.bz2 linux-stable-bde4f8fa8db2abd5ac9c542d76012d0fedab050f.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ahci: Add Marvell 6121 SATA support
pata_ali: use atapi_cmd_type() to determine cmd type instead of transfer size
ahci: implement skip_host_reset parameter
ahci: request all PCI BARs
devres: implement pcim_iomap_regions_request_all()
libata-acpi: improve dock event handling
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 9010f5458767..b7e4b633c69b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1045,6 +1045,8 @@ void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen); void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr); void __iomem * const *pcim_iomap_table(struct pci_dev *pdev); int pcim_iomap_regions(struct pci_dev *pdev, u16 mask, const char *name); +int pcim_iomap_regions_request_all(struct pci_dev *pdev, u16 mask, + const char *name); void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask); extern int pci_pci_problems; |