diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 21:41:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 21:41:42 -0500 |
| commit | 977127174a7dff52d17faeeb4c4949a54221881f (patch) | |
| tree | b05b9d18a1256d7ed97bdfb537213a8d70ccca57 /drivers/pci/remove.c | |
| parent | 80c0531514516e43ae118ddf38424e06e5c3cb3c (diff) | |
| parent | 93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/pci/remove.c')
| -rw-r--r-- | drivers/pci/remove.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 27a294b6965d..1a6bf9de166f 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c | |||
| @@ -48,6 +48,7 @@ static void pci_destroy_dev(struct pci_dev *dev) | |||
| 48 | * in question is not being used by a driver. | 48 | * in question is not being used by a driver. |
| 49 | * Returns 0 on success. | 49 | * Returns 0 on success. |
| 50 | */ | 50 | */ |
| 51 | #if 0 | ||
| 51 | int pci_remove_device_safe(struct pci_dev *dev) | 52 | int pci_remove_device_safe(struct pci_dev *dev) |
| 52 | { | 53 | { |
| 53 | if (pci_dev_driver(dev)) | 54 | if (pci_dev_driver(dev)) |
| @@ -55,7 +56,7 @@ int pci_remove_device_safe(struct pci_dev *dev) | |||
| 55 | pci_destroy_dev(dev); | 56 | pci_destroy_dev(dev); |
| 56 | return 0; | 57 | return 0; |
| 57 | } | 58 | } |
| 58 | EXPORT_SYMBOL(pci_remove_device_safe); | 59 | #endif /* 0 */ |
| 59 | 60 | ||
| 60 | void pci_remove_bus(struct pci_bus *pci_bus) | 61 | void pci_remove_bus(struct pci_bus *pci_bus) |
| 61 | { | 62 | { |