Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 27335
b: refs/heads/master
c: 3a720d7
h: refs/heads/master
i:
  27333: a31d6f7
  27331: a33ef6b
  27327: a5f075d
v: v3
  • Loading branch information
Brice Goglin authored and Jeff Garzik committed May 24, 2006
1 parent 3cc671c commit e81e8a5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d99ef36ed7e56f816a235f1af115420a81853fb9
refs/heads/master: 3a720d726a6aa0a7cd9190f694587adf7bafdf4f
3 changes: 1 addition & 2 deletions trunk/drivers/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions trunk/include/linux/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit e81e8a5

Please sign in to comment.