diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 18:13:32 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 18:13:32 -0800 |
commit | ef59c4e935feb966900a8321e75f74d7df2a2f16 (patch) | |
tree | 8bdd8e837554b268b600b57187612b9ac4a5d5f5 /drivers/pci/pci.c | |
parent | 69396dcfa3c50a6b8d2caaccf5d1496ecd5594be (diff) | |
parent | 3103039cc2a8dc6ababc29afac5c3cadbfa69af9 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
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 d2a633efa10..d2d18791664 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) return __pci_bus_find_cap(bus, devfn, hdr_type & 0x7f, cap); } +#if 0 /** * pci_find_ext_capability - Find an extended capability * @dev: PCI device to query @@ -210,6 +211,7 @@ int pci_find_ext_capability(struct pci_dev *dev, int cap) return 0; } +#endif /* 0 */ /** * pci_find_parent_resource - return resource region of parent bus of given region |