diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/pci/pci.h | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 33ed8e0aba1..fbd0e3adbca 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -313,4 +313,12 @@ static inline int pci_resource_alignment(struct pci_dev *dev, | |||
| 313 | 313 | ||
| 314 | extern void pci_enable_acs(struct pci_dev *dev); | 314 | extern void pci_enable_acs(struct pci_dev *dev); |
| 315 | 315 | ||
| 316 | struct pci_dev_reset_methods { | ||
| 317 | u16 vendor; | ||
| 318 | u16 device; | ||
| 319 | int (*reset)(struct pci_dev *dev, int probe); | ||
| 320 | }; | ||
| 321 | |||
| 322 | extern int pci_dev_specific_reset(struct pci_dev *dev, int probe); | ||
| 323 | |||
| 316 | #endif /* DRIVERS_PCI_H */ | 324 | #endif /* DRIVERS_PCI_H */ |