diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /drivers/pci/hotplug/pci_hotplug.h | |
parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'drivers/pci/hotplug/pci_hotplug.h')
-rw-r--r-- | drivers/pci/hotplug/pci_hotplug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pci_hotplug.h b/drivers/pci/hotplug/pci_hotplug.h index 57ace325168d..88d44f7fef29 100644 --- a/drivers/pci/hotplug/pci_hotplug.h +++ b/drivers/pci/hotplug/pci_hotplug.h | |||
@@ -150,7 +150,7 @@ struct hotplug_slot_info { | |||
150 | * @name: the name of the slot being registered. This string must | 150 | * @name: the name of the slot being registered. This string must |
151 | * be unique amoung slots registered on this system. | 151 | * be unique amoung slots registered on this system. |
152 | * @ops: pointer to the &struct hotplug_slot_ops to be used for this slot | 152 | * @ops: pointer to the &struct hotplug_slot_ops to be used for this slot |
153 | * @info: pointer to the &struct hotplug_slot_info for the inital values for | 153 | * @info: pointer to the &struct hotplug_slot_info for the initial values for |
154 | * this slot. | 154 | * this slot. |
155 | * @release: called during pci_hp_deregister to free memory allocated in a | 155 | * @release: called during pci_hp_deregister to free memory allocated in a |
156 | * hotplug_slot structure. | 156 | * hotplug_slot structure. |