diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /drivers/pci/pci.h | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 709eaa4fee5..fbd0e3adbca 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -319,6 +319,6 @@ struct pci_dev_reset_methods { | |||
| 319 | int (*reset)(struct pci_dev *dev, int probe); | 319 | int (*reset)(struct pci_dev *dev, int probe); |
| 320 | }; | 320 | }; |
| 321 | 321 | ||
| 322 | extern struct pci_dev_reset_methods pci_dev_reset_methods[]; | 322 | extern int pci_dev_specific_reset(struct pci_dev *dev, int probe); |
| 323 | 323 | ||
| 324 | #endif /* DRIVERS_PCI_H */ | 324 | #endif /* DRIVERS_PCI_H */ |