From e81e8a5a1c9331d7204dec3f2a0ce51bac71b796 Mon Sep 17 00:00:00 2001 From: Brice Goglin Date: Tue, 23 May 2006 06:10:01 -0400 Subject: [PATCH] --- yaml --- r: 27335 b: refs/heads/master c: 3a720d726a6aa0a7cd9190f694587adf7bafdf4f h: refs/heads/master i: 27333: a31d6f7414a124b63b17d4edfe18666ba6b185da 27331: a33ef6be0a6e684328dc4efdfb9701e1d28e642a 27327: a5f075d6ffa5ce67f509c66e0d68648103615320 v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci.c | 3 +-- trunk/include/linux/pci.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 963c521088a4..1612b6fc7ba4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d99ef36ed7e56f816a235f1af115420a81853fb9 +refs/heads/master: 3a720d726a6aa0a7cd9190f694587adf7bafdf4f diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c index 2329f941a0dc..8d107c6c2c70 100644 --- a/trunk/drivers/pci/pci.c +++ b/trunk/drivers/pci/pci.c @@ -164,7 +164,6 @@ 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 @@ -212,7 +211,7 @@ int pci_find_ext_capability(struct pci_dev *dev, int cap) return 0; } -#endif /* 0 */ +EXPORT_SYMBOL_GPL(pci_find_ext_capability); /** * pci_find_parent_resource - return resource region of parent bus of given region diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index 3a6a4e37a482..6fd36cb09160 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -442,6 +442,7 @@ struct pci_dev *pci_find_device_reverse (unsigned int vendor, unsigned int devic struct pci_dev *pci_find_slot (unsigned int bus, unsigned int devfn); int pci_find_capability (struct pci_dev *dev, int cap); int pci_find_next_capability (struct pci_dev *dev, u8 pos, int cap); +int pci_find_ext_capability (struct pci_dev *dev, int cap); struct pci_bus * pci_find_next_bus(const struct pci_bus *from); struct pci_dev *pci_get_device (unsigned int vendor, unsigned int device, struct pci_dev *from); @@ -662,6 +663,7 @@ static inline int pci_register_driver(struct pci_driver *drv) { return 0;} static inline void pci_unregister_driver(struct pci_driver *drv) { } static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; } static inline int pci_find_next_capability (struct pci_dev *dev, u8 post, int cap) { return 0; } +static inline int pci_find_ext_capability (struct pci_dev *dev, int cap) {return 0; } static inline const struct pci_device_id *pci_match_device(const struct pci_device_id *ids, const struct pci_dev *dev) { return NULL; } /* Power management related routines */