diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
| commit | 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb (patch) | |
| tree | 7f8d84353852401ec74e005f6f0b1eb958b9a70d /drivers/pci/pci.c | |
| parent | c0d3c0c0ce94d3db893577ae98e64414d92e49d8 (diff) | |
| parent | c03296a868ae7c91aa2d8b372184763b18f16d7a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index d2a633efa10a..d2d187916643 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -163,6 +163,7 @@ int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap) | |||
| 163 | return __pci_bus_find_cap(bus, devfn, hdr_type & 0x7f, cap); | 163 | return __pci_bus_find_cap(bus, devfn, hdr_type & 0x7f, cap); |
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | #if 0 | ||
| 166 | /** | 167 | /** |
| 167 | * pci_find_ext_capability - Find an extended capability | 168 | * pci_find_ext_capability - Find an extended capability |
| 168 | * @dev: PCI device to query | 169 | * @dev: PCI device to query |
| @@ -210,6 +211,7 @@ int pci_find_ext_capability(struct pci_dev *dev, int cap) | |||
| 210 | 211 | ||
| 211 | return 0; | 212 | return 0; |
| 212 | } | 213 | } |
| 214 | #endif /* 0 */ | ||
| 213 | 215 | ||
| 214 | /** | 216 | /** |
| 215 | * pci_find_parent_resource - return resource region of parent bus of given region | 217 | * pci_find_parent_resource - return resource region of parent bus of given region |