diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-22 17:32:50 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-22 17:32:50 -0400 |
| commit | 0f6662a49bf1b5a163ed4e6321c382d2390c817b (patch) | |
| tree | f52d6d047c37ce78af25a0db7e4f54737d023fe4 /drivers/pci/setup-bus.c | |
| parent | 1693c4276d768464058f191998e035e09ceb9e65 (diff) | |
| parent | 809a3bf9f34cb6d0c0383b31b3495fa1ed3508a6 (diff) | |
Merge branch 'topic/bjorn-trivial' into next
* topic/bjorn-trivial:
PCI: remove useless pcix_set_mmrbc() dev->bus check
PCI: acpiphp: check whether _ADR evaluation succeeded
PCI: shpchp: remove dead code
PCI: fix P2P bridge I/O port window sign extension
PCI: fix upstream P2P bridge checks when enabling OBFF and LTR
PCI: use __weak consistently
PCI: cleanup assign_requested_resources_sorted() kernel-doc warning
sparc/PCI: remove unused pcibios_assign_resource() definition
Diffstat (limited to 'drivers/pci/setup-bus.c')
| -rw-r--r-- | drivers/pci/setup-bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 192172c87b7..561e41cf102 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
| @@ -265,7 +265,7 @@ out: | |||
| 265 | * assign_requested_resources_sorted() - satisfy resource requests | 265 | * assign_requested_resources_sorted() - satisfy resource requests |
| 266 | * | 266 | * |
| 267 | * @head : head of the list tracking requests for resources | 267 | * @head : head of the list tracking requests for resources |
| 268 | * @failed_list : head of the list tracking requests that could | 268 | * @fail_head : head of the list tracking requests that could |
| 269 | * not be allocated | 269 | * not be allocated |
| 270 | * | 270 | * |
| 271 | * Satisfy resource requests of each element in the list. Add | 271 | * Satisfy resource requests of each element in the list. Add |