diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /drivers/pci/slot.c | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'drivers/pci/slot.c')
| -rw-r--r-- | drivers/pci/slot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c index eddb0748b0ea..8c02b6c53bdb 100644 --- a/drivers/pci/slot.c +++ b/drivers/pci/slot.c | |||
| @@ -311,7 +311,7 @@ EXPORT_SYMBOL_GPL(pci_destroy_slot); | |||
| 311 | #include <linux/pci_hotplug.h> | 311 | #include <linux/pci_hotplug.h> |
| 312 | /** | 312 | /** |
| 313 | * pci_hp_create_link - create symbolic link to the hotplug driver module. | 313 | * pci_hp_create_link - create symbolic link to the hotplug driver module. |
| 314 | * @slot: struct pci_slot | 314 | * @pci_slot: struct pci_slot |
| 315 | * | 315 | * |
| 316 | * Helper function for pci_hotplug_core.c to create symbolic link to | 316 | * Helper function for pci_hotplug_core.c to create symbolic link to |
| 317 | * the hotplug driver module. | 317 | * the hotplug driver module. |
| @@ -334,7 +334,7 @@ EXPORT_SYMBOL_GPL(pci_hp_create_module_link); | |||
| 334 | 334 | ||
| 335 | /** | 335 | /** |
| 336 | * pci_hp_remove_link - remove symbolic link to the hotplug driver module. | 336 | * pci_hp_remove_link - remove symbolic link to the hotplug driver module. |
| 337 | * @slot: struct pci_slot | 337 | * @pci_slot: struct pci_slot |
| 338 | * | 338 | * |
| 339 | * Helper function for pci_hotplug_core.c to remove symbolic link to | 339 | * Helper function for pci_hotplug_core.c to remove symbolic link to |
| 340 | * the hotplug driver module. | 340 | * the hotplug driver module. |