diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:23:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:23:35 -0800 |
| commit | c951aa62d59210636cc63a569bcf3331be7f5b15 (patch) | |
| tree | 151cde34d789db9fd8cf224603edff635997561a /drivers/pci/rom.c | |
| parent | 23beafbe3abd3f622931e83ef4e6b17642cf408e (diff) | |
| parent | a08f6e04d74478d91f34a0484e69e89870adb33d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: Documentation: fix minor PCIe HOWTO thinko
PCI: fix missing kernel-doc and typos
PCI: fix struct pci_platform_pm_ops kernel-doc
PCI: fix rom.c kernel-doc warning
PCI/MSI: fix msi_mask() shift fix
Diffstat (limited to 'drivers/pci/rom.c')
| -rw-r--r-- | drivers/pci/rom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c index 29cbe47f219..36864a935d6 100644 --- a/drivers/pci/rom.c +++ b/drivers/pci/rom.c @@ -55,6 +55,7 @@ void pci_disable_rom(struct pci_dev *pdev) /** * pci_get_rom_size - obtain the actual size of the ROM image + * @pdev: target PCI device * @rom: kernel virtual pointer to image of ROM * @size: size of PCI window * return: size of actual ROM image |