diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-29 08:46:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-29 08:47:05 -0400 |
| commit | e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a (patch) | |
| tree | 4ba588631dd8189a818a91c9e3976526071178b6 /drivers/pci/slot.c | |
| parent | 1130b0296184bc21806225fd06d533515a99d2db (diff) | |
| parent | 56a50adda49b2020156616c4eb15353e0f9ad7de (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 21189447e545..fe95ce20bcbd 100644 --- a/drivers/pci/slot.c +++ b/drivers/pci/slot.c | |||
| @@ -264,8 +264,8 @@ EXPORT_SYMBOL_GPL(pci_create_slot); | |||
| 264 | 264 | ||
| 265 | /** | 265 | /** |
| 266 | * pci_renumber_slot - update %struct pci_slot -> number | 266 | * pci_renumber_slot - update %struct pci_slot -> number |
| 267 | * @slot - %struct pci_slot to update | 267 | * @slot: &struct pci_slot to update |
| 268 | * @slot_nr - new number for slot | 268 | * @slot_nr: new number for slot |
| 269 | * | 269 | * |
| 270 | * The primary purpose of this interface is to allow callers who earlier | 270 | * The primary purpose of this interface is to allow callers who earlier |
| 271 | * created a placeholder slot in pci_create_slot() by passing a -1 as | 271 | * created a placeholder slot in pci_create_slot() by passing a -1 as |