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: remove unused resource assignment in pci_read_bridge_bases() PCI hotplug: shpchp: message refinement PCI hotplug: shpchp: replace printk with dev_printk PCI: add routines for debugging and handling lost interrupts PCI hotplug: pciehp: message refinement PCI: fix ARI code to be compatible with mixed ARI/non-ARI systems PCI hotplug: cpqphp: fix kernel NULL pointer dereference
This commit is contained in:
commit
3a2c5dad6c
16 changed files with 378 additions and 265 deletions
|
|
@ -546,6 +546,13 @@ struct pci_dev __deprecated *pci_find_slot(unsigned int bus,
|
|||
unsigned int devfn);
|
||||
#endif /* CONFIG_PCI_LEGACY */
|
||||
|
||||
enum pci_lost_interrupt_reason {
|
||||
PCI_LOST_IRQ_NO_INFORMATION = 0,
|
||||
PCI_LOST_IRQ_DISABLE_MSI,
|
||||
PCI_LOST_IRQ_DISABLE_MSIX,
|
||||
PCI_LOST_IRQ_DISABLE_ACPI,
|
||||
};
|
||||
enum pci_lost_interrupt_reason pci_lost_interrupt(struct pci_dev *dev);
|
||||
int pci_find_capability(struct pci_dev *dev, int cap);
|
||||
int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap);
|
||||
int pci_find_ext_capability(struct pci_dev *dev, int cap);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue