diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /drivers/pci/pci.h | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
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 */ |