diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2003-02-24 00:57:09 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2003-02-24 00:57:09 -0800 |
| commit | a6cc5237a1f189c30cd06d05e2955e5bc63d8913 (patch) | |
| tree | 508af99e0416edfffadc68994c16190e1a2e0cd5 /include/linux | |
| parent | 5fa167bc42933f7ba86f2c7d4e2068a2d7476f61 (diff) | |
| parent | 9b08bd4fb561146e158054cfacaf6c4fa9b98fa5 (diff) | |
Merge gregkh@kernel.bkbits.net:/home/gregkh/linux/pci-2.5
into kroah.com:/home/greg/linux/BK/pci-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index e63da00d4cf6..402a5e0a7c52 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -645,7 +645,8 @@ void pci_release_region(struct pci_dev *, int); int pci_register_driver(struct pci_driver *); void pci_unregister_driver(struct pci_driver *); void pci_insert_device(struct pci_dev *, struct pci_bus *); -void pci_remove_device(struct pci_dev *); +void pci_remove_bus_device(struct pci_dev *); +void pci_remove_behind_bridge(struct pci_dev *); struct pci_driver *pci_dev_driver(const struct pci_dev *); const struct pci_device_id *pci_match_device(const struct pci_device_id *ids, const struct pci_dev *dev); unsigned int pci_do_scan_bus(struct pci_bus *bus); @@ -692,7 +693,6 @@ struct pci_visit { extern int pci_visit_dev(struct pci_visit *fn, struct pci_dev_wrapped *wrapped_dev, struct pci_bus_wrapped *wrapped_parent); -extern int pci_is_dev_in_use(struct pci_dev *dev); extern int pci_remove_device_safe(struct pci_dev *dev); #endif /* CONFIG_PCI */ |